Merge pull request #3974 from oanaBiancaSchiopu/fix-detailed-variable-of-job

Remove-set-detailed-variables-since-it-is-already-set-on-job-info

scheduler/scheduler-client/src/main/java/org/ow2/proactive/scheduler/job/ClientJobState.java

@@ -103,7 +103,9 @@ public class ClientJobState extends JobState {
         this.setOnTaskError(jobState.getOnTaskErrorProperty().getValue());
 
         this.genericInformation = new LinkedHashMap<>(jobState.getGenericInformation());
-        jobInfo.setDetailedVariables(new LinkedHashMap<>(this.variables));
+        if (jobInfo.getDetailedVariables() == null) {
+            jobInfo.setDetailedVariables(new LinkedHashMap<>(variables));
+        }
         jobInfo.setGenericInformation(this.genericInformation);
         jobInfo.setVariables(this.getVariablesAsReplacementMap());
 

scheduler/scheduler-node/src/test/java/org/ow2/proactive/scheduler/task/utils/TaskKillerTest.java

@@ -109,7 +109,7 @@ public class TaskKillerTest {
                    is(false));
 
         // Wait 10 seconds for killing timeout to be exceeded
-        waitOrFailTest(10000);
+        waitOrFailTest(12000);
 
         assertThat("Task Killer must have interrupted at least twice after timeout has passed",
                    testThreadToBeInterrupted.isInterruptedMoreThanOnce,