Updated walltimeAdditionalDelay based on java files in

fit repository.
Reenabled OAR tests querying the job id.

diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py
index d94c0a3..d683e1f 100644 (file)
--- a/sfa/senslab/slabdriver.py
+++ b/sfa/senslab/slabdriver.py
@@ -1050,10 +1050,10 @@ class SlabDriver(Driver):
                     # First put the walltime in seconds oarAdditionalDelay = 20;
                     #  additional delay for /bin/sleep command to
                     # take in account  prologue and epilogue scripts execution
-                    # int walltimeAdditionalDelay = 120;  additional delay
+                    # int walltimeAdditionalDelay = 240;  additional delay
                     desired_walltime = duration 
-                    total_walltime = desired_walltime + 140#+2 min 20
-                    sleep_walltime = desired_walltime + 20 #+20 sec
+                    total_walltime = desired_walltime + 240 #+4 min Update SA 23/10/12
+                    sleep_walltime = desired_walltime  # 0 sec added Update SA 23/10/12
                     walltime = []
                     #Put the walltime back in str form
                     #First get the hours

diff --git a/sfa/senslab/tests/TestSuite.py b/sfa/senslab/tests/TestSuite.py
index db54c9c..177eaf7 100644 (file)
--- a/sfa/senslab/tests/TestSuite.py
+++ b/sfa/senslab/tests/TestSuite.py
@@ -199,11 +199,12 @@ def get_stuff(oar, uri):
 
 
   
-def TestOAR(job_id = '1'):
+def TestOAR(job_id ):
     
     if isinstance(job_id,list) and len(job_id) == 1:
        job_id = job_id[0]
-        
+       
+    print " JOB ID : " ,job_id    
     oar = OARrestapi()
     jobs = oar.parser.SendRequest("GET_reserved_nodes", username = 'avakian') 
     print "\r\n OAR GET_reserved_nodes ",jobs