fine-grain & brute force qemu kill (kill_qemus and kill_all_qemus)

[tests.git] / system / TestBox.py

diff --git a/system/TestBox.py b/system/TestBox.py
index 088922a..63300ed 100644 (file)
--- a/system/TestBox.py
+++ b/system/TestBox.py
@@ -14,10 +14,23 @@ class TestBox:
             return utils.system(command)
         else:
             if self.key:
-                to_run="ssh -i %s.rsa %s %s"%(self.key,self.hostname,command)
+                to_run="ssh -i %s.rsa %s %s"%(self.key,self.hostname,
+                                              utils.backslash_shell_specials(command))
             else:
-                to_run="ssh %s %s"%(self.hostname,command)
+                to_run="ssh %s %s"%(self.hostname,
+                                    utils.backslash_shell_specials(command))
+            return utils.system(to_run)
+        
+    def copy (self,local_file):
+        if self.hostname == "localhost":
+            return 0
+        else:
+            if self.key:
+                to_run="scp -i %s.rsa %s %s:"%(self.key,local_file,self.hostname)
+            else:
+                to_run="scp %s %s:"%(local_file,self.hostname)
             return utils.system(to_run)
         
     def kill_all_qemus(self):
         self.run("killall qemu")
+