чистка лишних импортов.и фикс бага с сохранением тестов
This commit is contained in:
@@ -3,18 +3,15 @@ import Common.Utils.Utils_;
|
||||
import _VisualDVM.Constants;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
|
||||
import _VisualDVM.GlobalData.Tasks.TaskState;
|
||||
import _VisualDVM.Passes.All.UnzipFolderPass;
|
||||
import _VisualDVM.TestingSystem.Common.TasksPackageState;
|
||||
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask;
|
||||
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
|
||||
import _VisualDVM.Utils;
|
||||
import javafx.util.Pair;
|
||||
import org.apache.commons.io.FileUtils;
|
||||
|
||||
import java.io.File;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.*;
|
||||
import java.util.Collections;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Vector;
|
||||
public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
|
||||
RemoteFile packageRemoteWorkspace = null;
|
||||
public RemoteDVMTestingPlanner(String... args) {
|
||||
@@ -174,10 +171,10 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
|
||||
@Override
|
||||
protected void DownloadResults() throws Exception {
|
||||
Utils_.CheckDirectory(packageLocalWorkspace);
|
||||
RemoteFile killedFile = new RemoteFile(packageRemoteWorkspace,"kill");
|
||||
if (user.connection.Exists(killedFile)){
|
||||
RemoteFile killedFile = new RemoteFile(packageRemoteWorkspace, "kill");
|
||||
if (user.connection.Exists(killedFile)) {
|
||||
UpdatePackageState(TasksPackageState.Aborted);
|
||||
}else {
|
||||
} else {
|
||||
RemoteFile remote_results_archive = new RemoteFile(packageRemoteWorkspace, "results.zip");
|
||||
File results_archive = new File(packageLocalWorkspace, "results.zip");
|
||||
user.connection.performScript(packageRemoteWorkspace, "zip -r " + Utils_.DQuotes("results.zip") + " " + Utils_.DQuotes("results"));
|
||||
@@ -190,7 +187,7 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
|
||||
UpdatePackageState(TasksPackageState.Analysis);
|
||||
}
|
||||
//---
|
||||
if (testingPackage.eraseWorkspace!=0 && user.connection.Exists(packageRemoteWorkspace))
|
||||
if (testingPackage.eraseWorkspace != 0 && user.connection.Exists(packageRemoteWorkspace))
|
||||
user.connection.RMDIR(packageRemoteWorkspace.full_name);
|
||||
}
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user