X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestSliver.py;h=e9aa7aa803d6e7a1c295c1ed93fdb72a34dcb923;hb=15ee278d63f8803fc6b58598ec1a3358e6dbc5e4;hp=b1f40d149cd8c87eac66420d151ebaf1d5e4eb5b;hpb=12d5d34e42cbabd96f2104e9a98eeebffb521a3d;p=tests.git

diff --git a/system/TestSliver.py b/system/TestSliver.py
index b1f40d1..e9aa7aa 100644
--- a/system/TestSliver.py
+++ b/system/TestSliver.py
@@ -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=False)==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):