diff --git a/.idea/workspace.xml b/.idea/workspace.xml index d6bc17f1..7eab9788 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,7 +7,6 @@ - diff --git a/src/TestingSystem/Common/TestingPlanner.java b/src/TestingSystem/Common/TestingPlanner.java index e421936f..87ae8b6a 100644 --- a/src/TestingSystem/Common/TestingPlanner.java +++ b/src/TestingSystem/Common/TestingPlanner.java @@ -110,20 +110,24 @@ public abstract class TestingPlanner

{ case TestsSynchronize: TestsSynchronize(); UpdatePackageState(TasksPackageState.PackageWorkspaceCreation); + Disconnect(); break; case PackageWorkspaceCreation: PackageWorkspaceCreation(); UpdatePackageState(TasksPackageState.PackageStart); + Disconnect(); break; case PackageStart: PackageStart(); EmailPackage(); testingPackage.StartDate = new Date().getTime(); UpdatePackageState(getStateAfterStart()); + Disconnect(); break; case RunningEnd: DownloadResults(); UpdatePackageState(TasksPackageState.Analysis); + Disconnect(); break; default: if (CheckNextState()) UpdatePackage(); @@ -134,6 +138,7 @@ public abstract class TestingPlanner

{ public void Perform() { while (true) { try { + testingPackage = null; testingPackage = (P) ServerCommand(getActivePackageCode()); if (testingPackage != null) { Print(testingPackage.id + ":" + testingPackage.state.getDescription()); diff --git a/src/TestingSystem/Common/TestingServer.java b/src/TestingSystem/Common/TestingServer.java index 818519fb..61812763 100644 --- a/src/TestingSystem/Common/TestingServer.java +++ b/src/TestingSystem/Common/TestingServer.java @@ -664,6 +664,10 @@ public class TestingServer extends RepositoryServer { for (SapforConfigurationCommand command : commands) { db.Delete(command); } + } else if (object instanceof DVMPackage) { + DVMPackage dvmPackage = (DVMPackage) object; + File workspace = new File(Global.PackagesDirectory, String.valueOf(dvmPackage.id)); + Utils.forceDeleteWithCheck(workspace); } } //---------------------------------------------------------------------------------------------->>> diff --git a/src/TestingSystem/DVM/DVMTestingPlanner.java b/src/TestingSystem/DVM/DVMTestingPlanner.java index 7c4d25d2..5475d759 100644 --- a/src/TestingSystem/DVM/DVMTestingPlanner.java +++ b/src/TestingSystem/DVM/DVMTestingPlanner.java @@ -366,8 +366,6 @@ public class DVMTestingPlanner extends TestingPlanner { //-- packageRemoteWorkspace = new RemoteFile(user.workspace + "/tests", String.valueOf(testingPackage.id), true); packageLocalWorkspace = new File(Global.PackagesDirectory, String.valueOf(testingPackage.id)); - //- - Print("packageremoteWorkspace=" + Utils.Brackets(packageRemoteWorkspace.full_name)); } @Override protected boolean Connect() {