M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

принудительный обрыв соединения после пересылок и консольных команд.

Browse Source
This commit is contained in:
02090095
2023-12-15 16:27:01 +03:00
parent 730ded1f4c
commit bd702b3ebc
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/workspace.xml generated
View File

@@ -7,7 +7,6 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" afterDir="false" />

5
src/TestingSystem/Common/TestingPlanner.java
View File

@@ -110,20 +110,24 @@ public abstract class TestingPlanner<P extends TestingPackage> {
case TestsSynchronize: case TestsSynchronize:
TestsSynchronize(); TestsSynchronize();
UpdatePackageState(TasksPackageState.PackageWorkspaceCreation); UpdatePackageState(TasksPackageState.PackageWorkspaceCreation);
Disconnect();
break; break;
case PackageWorkspaceCreation: case PackageWorkspaceCreation:
PackageWorkspaceCreation(); PackageWorkspaceCreation();
UpdatePackageState(TasksPackageState.PackageStart); UpdatePackageState(TasksPackageState.PackageStart);
Disconnect();
break; break;
case PackageStart: case PackageStart:
PackageStart(); PackageStart();
EmailPackage(); EmailPackage();
testingPackage.StartDate = new Date().getTime(); testingPackage.StartDate = new Date().getTime();
UpdatePackageState(getStateAfterStart()); UpdatePackageState(getStateAfterStart());
Disconnect();
break; break;
case RunningEnd: case RunningEnd:
DownloadResults(); DownloadResults();
UpdatePackageState(TasksPackageState.Analysis); UpdatePackageState(TasksPackageState.Analysis);
Disconnect();
break; break;
default: default:
if (CheckNextState()) UpdatePackage(); if (CheckNextState()) UpdatePackage();
@@ -134,6 +138,7 @@ public abstract class TestingPlanner<P extends TestingPackage> {
public void Perform() { public void Perform() {
while (true) { while (true) {
try { try {
testingPackage = null;
testingPackage = (P) ServerCommand(getActivePackageCode()); testingPackage = (P) ServerCommand(getActivePackageCode());
if (testingPackage != null) { if (testingPackage != null) {
Print(testingPackage.id + ":" + testingPackage.state.getDescription()); Print(testingPackage.id + ":" + testingPackage.state.getDescription());

4
src/TestingSystem/Common/TestingServer.java
View File

@@ -664,6 +664,10 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
for (SapforConfigurationCommand command : commands) { for (SapforConfigurationCommand command : commands) {
db.Delete(command); 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);
} }
} }
//---------------------------------------------------------------------------------------------->>> //---------------------------------------------------------------------------------------------->>>

2
src/TestingSystem/DVM/DVMTestingPlanner.java
View File

@@ -366,8 +366,6 @@ public class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
//-- //--
packageRemoteWorkspace = new RemoteFile(user.workspace + "/tests", String.valueOf(testingPackage.id), true); packageRemoteWorkspace = new RemoteFile(user.workspace + "/tests", String.valueOf(testingPackage.id), true);
packageLocalWorkspace = new File(Global.PackagesDirectory, String.valueOf(testingPackage.id)); packageLocalWorkspace = new File(Global.PackagesDirectory, String.valueOf(testingPackage.id));
//-
Print("packageremoteWorkspace=" + Utils.Brackets(packageRemoteWorkspace.full_name));
} }
@Override @Override
protected boolean Connect() { protected boolean Connect() {