промежуточный. редактирование пакетов тестирования ДВМ, и возможность их перезапуска.
This commit is contained in:
@@ -130,6 +130,21 @@ public abstract class TestingPackage<J> extends riDBObject {
|
||||
res.add(Global.testingServer.db.tests.get(o_id));
|
||||
return res;
|
||||
}
|
||||
public void Reset() {
|
||||
StartDate = 0;
|
||||
ChangeDate = 0;
|
||||
progress = 0;
|
||||
state = TasksPackageState.Inactive;
|
||||
//--
|
||||
File loaded = new File(getLocalWorkspace(), Constants.LOADED);
|
||||
if (loaded.exists()) {
|
||||
try {
|
||||
Utils.forceDeleteWithCheck(loaded);
|
||||
} catch (Exception ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
/*
|
||||
public void printCGT() {
|
||||
try {
|
||||
|
||||
@@ -72,6 +72,7 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
|
||||
//--
|
||||
LinkedHashMap<Integer, File> tests = getTestsFromJson();
|
||||
//создать папку для пакета.
|
||||
user.connection.RMDIR(packageRemoteWorkspace.full_name);
|
||||
user.connection.sftpChannel.mkdir(packageRemoteWorkspace.full_name);
|
||||
//положить туда запакованные тексты задач.
|
||||
Vector<String> compilationLines = new Vector<>();
|
||||
|
||||
@@ -27,6 +27,9 @@ public abstract class AbortTestingPackage extends TestingSystemPass<TestingPacka
|
||||
case Aborted:
|
||||
Log.Writeln_("Пакет уже завершен.");
|
||||
break;
|
||||
case Inactive:
|
||||
Log.Writeln_("Пакет неактивен.");
|
||||
break;
|
||||
default:
|
||||
packageToKill = new TestingPackageToKill();
|
||||
packageToKill.packageId = target.id;
|
||||
|
||||
@@ -167,6 +167,7 @@ public class SaveCurrentDVMPackage extends EditServerObject<TestingServer, DVMPa
|
||||
target.saveTests(tests);
|
||||
//--
|
||||
target.saveTasks(tasks, tasks_count);
|
||||
target.Reset();
|
||||
super.ServerAction();
|
||||
}
|
||||
@Override
|
||||
|
||||
@@ -22,8 +22,8 @@ public class StartDVMPackage extends EditServerObject<TestingServer, DVMPackage>
|
||||
if (Current.Check(Log,Current.DVMPackage)) {
|
||||
target = Current.getDVMPackage();
|
||||
//-
|
||||
if (target.state.isActive()) {
|
||||
Log.Writeln_("Пакет уже запущен.");
|
||||
if (!target.state.equals(TasksPackageState.Inactive)) {
|
||||
Log.Writeln_("Возможно запустить только неактивный пакет.");
|
||||
return false;
|
||||
}
|
||||
if (target.tasksCount == 0) {
|
||||
|
||||
Reference in New Issue
Block a user