cosmetic

[tests.git] / system / TestSsh.py

diff --git a/system/TestSsh.py b/system/TestSsh.py
index d392659..1028a18 100644 (file)
--- a/system/TestSsh.py
+++ b/system/TestSsh.py
@@ -1,5 +1,5 @@
-#
-# Thierry Parmentelat - INRIA
+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
+# Copyright (C) 2010 INRIA 
 #
 # class for issuing commands on a box, either local or remote
 #
@@ -17,6 +17,7 @@
 
 import os.path
 import utils
+import shutil
 
 class TestSsh:
     
@@ -55,7 +56,7 @@ class TestSsh:
     def is_local(self):
         return TestSsh.is_local_hostname(self.hostname)
      
-    std_options="-o StrictHostKeyChecking=no -o BatchMode=yes "
+    std_options="-o BatchMode=yes -o StrictHostKeyChecking=no -o CheckHostIP=no -o ConnectTimeout=5 -o UserKnownHostsFile=/dev/null "
     
     def key_part (self):
         if not self.key:
@@ -100,6 +101,17 @@ class TestSsh:
             dirname=self.buildname
         return self.run("mkdir -p %s"%dirname)
 
+    def rmdir (self,dirname=None):
+        if self.is_local():
+            if dirname:
+                return shutil.rmtree(dirname)
+            return 0
+        if dirname:
+            dirname="%s/%s"%(self.buildname,dirname)
+        else:
+            dirname=self.buildname
+        return self.run("rm -rf %s"%dirname)
+
     def create_buildname_once (self):
         if self.is_local():
             return
@@ -128,6 +140,21 @@ class TestSsh:
                                       self.buildname,os.path.basename(local_file) or ".")
         return utils.system(scp_command)
 
+    def copy_abs (self,local_file,remote_file,recursive=False):
+        if self.is_local():
+            dest=""
+        else:
+            dest= "%s:"%self.hostname_part()
+        scp_command="scp "
+        scp_command += TestSsh.std_options
+        if recursive: scp_command += "-r "
+        scp_command += self.key_part()
+        scp_command += "%s %s%s"%(local_file,dest,remote_file)
+        return utils.system(scp_command)
+
+    def copy_home (self, local_file, recursive=False):
+        return self.copy_abs(local_file,os.path.basename(local_file),recursive)
+
     def fetch (self, remote_file, local_file, recursive=False):
         if self.is_local():
             command="cp "
@@ -138,8 +165,13 @@ class TestSsh:
             command += TestSsh.std_options
             if recursive: command += "-r "
             command += self.key_part()
-            command += "%s:%s/%s %s"%(self.hostname_part(),self.buildname,remote_file,local_file)
-        utils.system(command)
+            # absolute path - do not preprend buildname
+            if remote_file.find("/")==0:
+                remote_path=remote_file
+            else:
+                remote_path="%s/%s"%(self.buildname,remote_file)
+            command += "%s:%s %s"%(self.hostname_part(),remote_path,local_file)
+        return utils.system(command)
 
     # this is only to avoid harmless message when host cannot be identified
     # convenience only
@@ -148,5 +180,5 @@ class TestSsh:
     def clear_known_hosts (self):
         known_hosts = "%s/.ssh/known_hosts"%os.getenv("HOME")
         utils.header("Clearing entry for %s in %s"%(self.hostname,known_hosts))
-        utils.system("sed -i -e /^%s/d %s"%(self.hostname,known_hosts))
+        return utils.system("sed -i -e /^%s/d %s"%(self.hostname,known_hosts))