X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestPlc.py;h=5785c15260fcb71cc209f76d8cd97288770693e3;hb=df8006feda3e410f0ce2757ceb5e41ed8c5d8d63;hp=2fe909a9fb15feaf3302eb08df68490f17883f8f;hpb=19289924105600a78fc80ac0d6b96801c1f26756;p=tests.git diff --git a/system/TestPlc.py b/system/TestPlc.py index 2fe909a..5785c15 100644 --- a/system/TestPlc.py +++ b/system/TestPlc.py @@ -164,23 +164,23 @@ class TestPlc: def kill_all_qemus(self,options): for (box,nodes) in self.gather_hostBoxes().iteritems(): # this is the brute force version, kill all qemus on that host box - TestBox(box).kill_all_qemus() + TestBox(box,options.buildname).kill_all_qemus() return True # make this a valid step def list_all_qemus(self,options): for (box,nodes) in self.gather_hostBoxes().iteritems(): # push the script - TestBox(box).copy("qemu_kill.sh") + TestBox(box,options.buildname).copy("qemu_kill.sh") # this is the brute force version, kill all qemus on that host box - TestBox(box).run("./qemu_kill.sh -l") + TestBox(box,options.buildname).run_in_buildname("qemu_kill.sh -l") return True # kill only the right qemus def kill_qemus(self,options): for (box,nodes) in self.gather_hostBoxes().iteritems(): # push the script - TestBox(box).copy("qemu_kill.sh") + TestBox(box,options.buildname).copy("qemu_kill.sh") # the fine-grain version for node in nodes: node.kill_qemu() @@ -501,7 +501,9 @@ class TestPlc: test_site = TestSite (self,site_spec) for node_spec in site_spec['nodes']: test_node=TestNode (self,test_site,node_spec) - test_node.create_boot_cd(options.path) + test_node.prepare_area() + test_node.create_boot_cd() + test_node.configure_qemu() return True def do_check_intiscripts(self):