v++
Исправлен таймаут на скачивание пакетов.Разрешено добавлять в группу завершенный с ошибками пакет( только успешные задачи)
This commit is contained in:
@@ -18,6 +18,10 @@ public class CompareSapforPackages extends Pass<Vector<SapforPackage>> {
|
||||
return "";
|
||||
}
|
||||
@Override
|
||||
protected boolean needsAnimation() {
|
||||
return true;
|
||||
}
|
||||
@Override
|
||||
protected boolean canStart(Object... args) throws Exception {
|
||||
master = null;
|
||||
slave = null;
|
||||
|
||||
@@ -30,7 +30,7 @@ public class DownloadDVMPackages extends TestingServerPass<Vector<Integer>> {
|
||||
protected boolean canStart(Object... args) throws Exception {
|
||||
target = (Vector<Integer>) args[0];
|
||||
packed_packages = null;
|
||||
return SendRequest(ServerCode.DownloadDVMPackages, "", target);
|
||||
return SendRequest(ServerCode.DownloadDVMPackages, "", target,0 );
|
||||
}
|
||||
@Override
|
||||
protected void body() throws Exception {
|
||||
|
||||
@@ -23,7 +23,7 @@ public class DownloadSapforPackage extends TestingServerPass<SapforPackage> {
|
||||
}
|
||||
int id = target.id;
|
||||
loaded = new File(target.getLocalWorkspace(), CommonConstants.LOADED);
|
||||
return !loaded.exists()&&SendRequest(ServerCode.DownloadSapforPackage, "", id);
|
||||
return !loaded.exists()&&SendRequest(ServerCode.DownloadSapforPackage, "", id, 0);
|
||||
}
|
||||
@Override
|
||||
protected void body() throws Exception {
|
||||
|
||||
@@ -21,7 +21,7 @@ public class JoinSapforTestingVersionsToGroup extends TestingServerPass {
|
||||
if (Global.testingServer.db.CheckCurrent(Log, Group.class, SapforPackage.class)){
|
||||
group = Global.testingServer.db.groups.getUI().getCurrent();
|
||||
sapforPackage = Global.testingServer.db.sapforPackages.getUI().getCurrent();
|
||||
if (!sapforPackage.state.equals(TasksPackageState.Done)){
|
||||
if (!sapforPackage.state.equals(TasksPackageState.Done)&&!sapforPackage.state.equals(TasksPackageState.DoneWithErrors)){
|
||||
Log.Writeln_("Пакет не завершен!");
|
||||
return false;
|
||||
}
|
||||
@@ -30,17 +30,6 @@ public class JoinSapforTestingVersionsToGroup extends TestingServerPass {
|
||||
return false;
|
||||
}
|
||||
@Override
|
||||
protected void body() throws Exception {
|
||||
/*
|
||||
Vector<String> res = (Vector<String>) request.server_response.object;
|
||||
System.out.println("--");
|
||||
for (String path: res){
|
||||
System.out.println(Utils_.Brackets(path));
|
||||
}
|
||||
System.out.println("--");
|
||||
*/
|
||||
}
|
||||
@Override
|
||||
protected void performFinish() throws Exception {
|
||||
Global.mainModule.getPass(PassCode.SynchronizeTests).Do();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user