From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 30 May 2008 15:23:21 +0000 (+0000)
Subject: speed up a bit
X-Git-Tag: tests-4.3-0~166
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=80eecbd8a500756ef70cfdfe783224644b50992a;p=tests.git

speed up a bit
---

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 441a0a6..b92f048 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -485,7 +485,7 @@ class TestPlc:
         return hostnames
 
     # gracetime : during the first <gracetime> minutes nothing gets printed
-    def do_nodes_booted (self, minutes, gracetime,period=30):
+    def do_nodes_booted (self, minutes, gracetime,period=15):
         if self.options.dry_run:
             print 'dry_run'
             return True
@@ -533,7 +533,7 @@ class TestPlc:
     def nodes_booted(self):
         return self.do_nodes_booted(minutes=20,gracetime=15)
 
-    def do_nodes_ssh(self,minutes,gracetime,period=30):
+    def do_nodes_ssh(self,minutes,gracetime,period=15):
         # compute timeout
         timeout = datetime.datetime.now()+datetime.timedelta(minutes=minutes)
         graceout = datetime.datetime.now()+datetime.timedelta(minutes=gracetime)
diff --git a/system/TestSlice.py b/system/TestSlice.py
index 41e5146..478e5d0 100644
--- a/system/TestSlice.py
+++ b/system/TestSlice.py
@@ -75,7 +75,7 @@ class TestSlice:
                     found=True
         return (found,privatekey)
 
-    def check_slice(self,options,minutes=6,gracetime=3,period=30):
+    def check_slice(self,options,minutes=6,gracetime=3,period=15):
         timeout = datetime.datetime.now()+datetime.timedelta(minutes=minutes)
         graceout = datetime.datetime.now()+datetime.timedelta(minutes=gracetime)
         # locate a key
@@ -96,8 +96,9 @@ class TestSlice:
             for hostname in tocheck:
                 (site_spec,node_spec) = self.test_plc.locate_hostname(hostname)
                 date_test_ssh = TestSsh (hostname,key=remote_privatekey,username=self.name())
+                if datetime.datetime.now() >= graceout:
+                    utils.header('Trying to enter into slice %s@%s'%(self.name(),hostname))
                 # this can be ran locally as we have the key
-                utils.header('Trying to enter into slice %s@%s'%(self.name(),hostname))
                 date = date_test_ssh.run("id;hostname")==0
                 if date:
                     utils.header("Successfuly entered slice %s on %s"%(self.name(),hostname))
@@ -124,10 +125,7 @@ class TestSlice:
                 for hostname in tocheck:
                     utils.header("FAILURE to ssh into %s@%s"%(self.name(),hostname))
                 return False
-            #freezing ,slice don't get created before at least 3 minutes after sshd is started 
-            if datetime.datetime.now() < graceout:
-                utils.header ("The Slice %s under the Node %s is not created yet"%(self.name(),hostname))
-                time.sleep(gracetime*60)
-            else : time.sleep (period)
+            # wait for the period
+            time.sleep (period)
         # for an empty slice
         return True