do not ignore the ssh-slice-again step; this is still broken in f20

[tests.git] / system / TestSsh.py

diff --git a/system/TestSsh.py b/system/TestSsh.py
index e07d97e..7448ee7 100644 (file)
--- a/system/TestSsh.py
+++ b/system/TestSsh.py
@@ -29,9 +29,9 @@ class TestSsh:
         result=''
         for char in command:
             if char in "\\\"'<>&|;()$*~":
-                result +='\\'+char
+                result += '\\'+char
             else:
-                result +=char
+                result += char
         return result
 
     # check main IP address against the provided hostname
@@ -184,7 +184,8 @@ class TestSsh:
                                       self.fullname(self.buildname),os.path.basename(local_file) or ".")
         if dry_run:
             utils.header ("DRY RUN TestSsh.copy %s"%scp_command)
-            return True
+            # need to be consistent with the non-dry-run mode
+            return 0
         return utils.system(scp_command)
 
     def copy_abs (self,local_file,remote_file,recursive=False):