expose buildname in options to avoid filename conflicts on host boxes

[tests.git] / system / TestNode.py

diff --git a/system/TestNode.py b/system/TestNode.py
index 993594b..f4a55dc 100644 (file)
--- a/system/TestNode.py
+++ b/system/TestNode.py
@@ -151,15 +151,8 @@ class TestNode:
         else:
             utils.header("TestNode.start_node : ignoring model %s"%model)
 
-    def get_host_in_hostbox(self,hostbox,test_site):
-        hosts=[]
-        for node_spec in test_site.site_spec['nodes']:
-            if (node_spec['host_box'] == hostbox):
-                hosts.append((node_spec['node_fields']['hostname'],node_spec['node_fields']['model']))
-        return hosts
-        
     def start_qemu (self, options):
-        utils.header("Starting Qemu nodes")
+        utils.header("Starting Qemu node")
         host_box=self.host_box()
         hostname=self.node_spec['node_fields']['hostname']
         path=options.path
@@ -172,7 +165,7 @@ class TestNode:
     def kill_qemu (self):
         hostname = self.name()
         # kill the right processes 
-        command="kill $(ps $(pgrep qemu) | grep %s | awk '{print $1;}')"%hostname
+        command="./qemu_kill.sh %s"%hostname
         utils.header("Stopping qemu for host %s on box %s"%(hostname,self.host_box()))
         TestBox(self.host_box()).run(command)
         return True