X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=system%2FTestSliver.py;h=e9aa7aa803d6e7a1c295c1ed93fdb72a34dcb923;hb=6385ce35811043697567e7a1ebb1c49ecd0fde8e;hp=c4b3fb84c8a9fbf826b60f431ddea5de733ede74;hpb=8562147f6fff5456f230b560cc7504850df24d1a;p=tests.git

diff --git a/system/TestSliver.py b/system/TestSliver.py
index c4b3fb8..e9aa7aa 100644
--- a/system/TestSliver.py
+++ b/system/TestSliver.py
@@ -24,10 +24,10 @@ class TestSliver:
             print str(e)
             
     def create_test_ssh(self):
-        (found,privatekey) = self.get_privateKey()
-        if not found:
+        private_key = self.test_slice.locate_private_key()
+        if not private_key:
             raise Exception,"Cannot find the private key for slice %s"%self.test_slice.name()
-        return TestSsh (self.test_node.name(),key=privatekey,username=self.test_slice.name(),
+        return TestSsh (self.test_node.name(),key=private_key,username=self.test_slice.name(),
                         # so that copies end up in the home dir
                         buildname=".")
 
@@ -36,17 +36,23 @@ class TestSliver:
 
     def check_initscript_stamp(self,stamp):
         utils.header("Checking for initscript stamp %s on sliver %s"%(stamp,self.name()))
-        return self.test_ssh.run("ls -l /tmp/%s.stamp"%stamp)==0
+        return self.test_ssh.run("ls -l /var/tmp/%s.stamp"%stamp)==0
     
     def run_tcp_server (self,port,timeout=10):
         server_command = "./tcptest.py server -p %d -t %d"%(port,timeout)
         return self.test_ssh.copy("tcptest.py")==0 and \
             self.test_ssh.run(server_command,background=True)==0
 
-    def run_tcp_client (self,servername,port):
+    def run_tcp_client (self,servername,port,retry=5):
         client_command="./tcptest.py client -a %s -p %d"%(servername,port)
-        return self.test_ssh.copy("tcptest.py")==0 and \
-            self.test_ssh.run(client_command,background=True)==0
+        if self.test_ssh.copy("tcptest.py")!=0: return False
+        utils.header ("tcp client - first attempt")
+        if self.test_ssh.run(client_command,background=False)==0: return True
+        # if first try has failed, wait for <retry> s an try again
+        time.sleep(retry)
+        utils.header ("tcp client - second attempt")
+        if self.test_ssh.run(client_command,background=False)==0: return True
+        return False
 
     # use the node's main ssh root entrance, as the slice entrance might be down
     #def tar_var_logs (self):