From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 4 Apr 2008 13:11:33 +0000 (+0000)
Subject: fixes
X-Git-Tag: tests-4.2-4~93
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6539ec0607e102ab484cc60bd0725b7fc46e4c9e;p=tests.git

fixes
---

diff --git a/system/TestMain.py b/system/TestMain.py
index e4dda38..c576d25 100755
--- a/system/TestMain.py
+++ b/system/TestMain.py
@@ -213,6 +213,8 @@ steps refer to a method in TestPlc or to a step_* module
         testplc_method_dict = __import__("TestPlc").__dict__['TestPlc'].__dict__
         all_step_infos=[]
         for step in self.options.steps:
+            if step == SEP:
+                continue
             force=False
             # is it a forcedstep
             if step.find("force_") == 0:
diff --git a/system/TestNode.py b/system/TestNode.py
index be3faa3..2c94b78 100644
--- a/system/TestNode.py
+++ b/system/TestNode.py
@@ -137,7 +137,7 @@ class TestNode:
         conf_filename="%s/qemu.conf"%(self.nodedir())
         if self.test_plc.options.dry_run:
             print "dry_run: skipped actual storage of qemu.conf"
-            return
+            return True
         utils.header('Storing qemu config for %s in %s'%(self.name(),conf_filename))
         file=open(conf_filename,'w')
         file.write('MACADDR=%s\n'%mac)
@@ -177,8 +177,6 @@ class TestNode:
     def kill_qemu (self):
         #Prepare the log file before killing the nodes
         test_box = self.test_box()
-        if(not test_box.tar_logs()):
-            utils.header("Failed to get the nodes log files")
         # kill the right processes 
         utils.header("Stopping qemu for host %s on box %s"%(self.name(),self.test_box().hostname()))
         command="qemu-%s/qemu-kill-node %s"%(self.name(),self.name())
diff --git a/system/TestPlc.py b/system/TestPlc.py
index cdcd8d8..ad43ada 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -607,7 +607,7 @@ class TestPlc:
 
             # idem for the client side
             c_test_sliver = self.locate_sliver_obj(spec['server_node'],spec['server_slice'])
-            if not c_test_sliver.run_tcp_client(s_test_node.name(),port):
+            if not c_test_sliver.run_tcp_client(s_test_sliver.test_node.name(),port):
                 overall=False
         return overall