ported changes from commits 275f0ee and 4d2d96d on master branch to fix TestLoadJobs

 Had to disable testLoadNoJob as it was failing altogether

Author: fviale

scheduler/scheduler-server/src/test/java/functionaltests/TestForkedTaskWorkingDir.java

@@ -36,11 +36,8 @@
  */
 package functionaltests;
 
-import java.io.File;
-import java.io.Serializable;
-import java.net.URI;
-
-import org.objectweb.proactive.api.PAActiveObject;
+import org.apache.commons.io.FileUtils;
+import org.junit.Test;
 import org.objectweb.proactive.utils.OperatingSystem;
 import org.ow2.proactive.resourcemanager.common.NodeState;
 import org.ow2.proactive.resourcemanager.common.event.RMEventType;
@@ -53,13 +50,15 @@
 import org.ow2.proactive.scheduler.common.task.TaskResult;
 import org.ow2.proactive.scheduler.common.task.dataspaces.OutputAccessMode;
 import org.ow2.proactive.scheduler.common.task.executable.JavaExecutable;
+import org.ow2.proactive.scheduler.util.FileLock;
 import org.ow2.tests.FunctionalTest;
-import org.apache.commons.io.FileUtils;
-import org.junit.Test;
 
-import functionaltests.utils.ProActiveLock;
+import java.io.File;
+import java.io.Serializable;
+import java.net.URI;
+import java.nio.file.Path;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
 import static org.ow2.proactive.utils.FileUtils.createTempDirectory;
 
 
@@ -120,19 +119,20 @@ private void nativeTask() throws Exception {
      * space was correctly setup by transferring a file created in working dir from the task
      */
     private void javaTaskTaskRestartedAnotherNode() throws Exception {
-        ProActiveLock blockTaskFromTest = PAActiveObject.newActive(ProActiveLock.class, new Object[] {});
-        ProActiveLock blockTestBeforeKillingNode = PAActiveObject.newActive(ProActiveLock.class,
-                new Object[] {});
+        FileLock blockTaskFromTest = new FileLock();
+        Path blockTaskFromTestPath = blockTaskFromTest.lock();
+
+        FileLock blockTestBeforeKillingNode = new FileLock();
+        Path blockTestBeforeKillingNodePath = blockTestBeforeKillingNode.lock();
 
-        TaskFlowJob job = createFileInLocalSpaceJob(PAActiveObject.getUrl(blockTaskFromTest), PAActiveObject
-                .getUrl(blockTestBeforeKillingNode));
+        TaskFlowJob job = createFileInLocalSpaceJob(blockTaskFromTestPath.toString(), blockTestBeforeKillingNodePath.toString());
 
         JobId idJ1 = SchedulerTHelper.submitJob(job);
 
         SchedulerTHelper.log("Wait until task is in the middle of the run");
         final String taskNodeUrl = findNodeRunningTask();
         SchedulerTHelper.waitForEventTaskRunning(idJ1, "task1");
-        ProActiveLock.waitUntilUnlocked(blockTestBeforeKillingNode);
+        FileLock.waitUntilUnlocked(blockTestBeforeKillingNodePath);
 
         SchedulerTHelper.log("Kill the node running the task");
         RMTHelper.getDefaultInstance().killNode(taskNodeUrl);
@@ -180,15 +180,10 @@ public static class CreateFileInLocalSpaceTask extends JavaExecutable {
 
         @Override
         public Serializable execute(TaskResult... results) throws Throwable {
-            ProActiveLock blockTaskFromTest = PAActiveObject.lookupActive(ProActiveLock.class,
-                    blockTaskFromTestUrl);
-
-            ProActiveLock blockTestBeforeKillingNode = PAActiveObject.lookupActive(ProActiveLock.class,
-                    blockTestBeforeKillingNodeUrl);
 
-            blockTestBeforeKillingNode.unlock();
+            FileLock.unlock(blockTestBeforeKillingNodeUrl);
             // for the first execution, the node will be killed here
-            ProActiveLock.waitUntilUnlocked(blockTaskFromTest);
+            FileLock.waitUntilUnlocked(blockTaskFromTestUrl);
 
             return new File("output_file.txt").createNewFile();
         }

scheduler/scheduler-server/src/test/java/functionaltests/TestJobRecoverClasspathInUserSpace.java

@@ -36,17 +36,15 @@
  */
 package functionaltests;
 
-import java.io.File;
-
-import org.objectweb.proactive.api.PAActiveObject;
+import org.junit.Test;
 import org.ow2.proactive.scheduler.common.job.JobEnvironment;
 import org.ow2.proactive.scheduler.common.job.JobId;
 import org.ow2.proactive.scheduler.common.job.TaskFlowJob;
+import org.ow2.proactive.scheduler.util.FileLock;
 import org.ow2.tests.FunctionalTest;
 
-import org.junit.Test;
-
-import functionaltests.utils.ProActiveLock;
+import java.io.File;
+import java.nio.file.Path;
 
 import static functionaltests.TestPauseJobRecover.createJob;
 
@@ -56,9 +54,10 @@ public class TestJobRecoverClasspathInUserSpace extends FunctionalTest {
     @Test
     // SCHEDULING-2077
     public void action() throws Throwable {
-        ProActiveLock controlJobExecution = PAActiveObject.newActive(ProActiveLock.class, new Object[] {});
+        FileLock controlJobExecution = new FileLock();
+        Path controlJobExecutionPath = controlJobExecution.lock();
 
-        TaskFlowJob job = createJob(PAActiveObject.getUrl(controlJobExecution));
+        TaskFlowJob job = createJob(controlJobExecutionPath.toString());
         JobEnvironment env = new JobEnvironment();
         env.setJobClasspath(new String[] { "$USERSPACE/test.jar" });
         job.setEnvironment(env);