From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 17 Apr 2013 06:44:15 +0000 (+0200)
Subject: adapting to kvm boxes under /vservers
X-Git-Tag: tests-5.2-2~11
X-Git-Url: http://git.onelab.eu/?p=tests.git;a=commitdiff_plain;h=df7d9eda1e8099ab85327273013c44c11afcaf5d

adapting to kvm boxes under /vservers
---

diff --git a/system/Substrate.py b/system/Substrate.py
index 48d6b98..fe6d6c7 100644
--- a/system/Substrate.py
+++ b/system/Substrate.py
@@ -730,13 +730,13 @@ class QemuBox (Box):
             header(">>%s<<"%line)
         ########## retrieve alive instances and map to build
         live_builds=[]
-        command=['grep','.','*/*/qemu.pid','/dev/null']
+        command=['grep','.','/vservers/*/*/qemu.pid','/dev/null']
         pid_lines=self.backquote_ssh(command,trash_err=True).split('\n')
         for pid_line in pid_lines:
             if not pid_line.strip(): continue
             # expect <build>/<nodename>/qemu.pid:<pid>pid
             try:
-                (buildname,nodename,tail)=pid_line.split('/')
+                (_,__,buildname,nodename,tail)=pid_line.split('/')
                 (_,pid)=tail.split(':')
                 q=self.qemu_instance_by_pid (pid)
                 if not q: continue
diff --git a/system/TestNode.py b/system/TestNode.py
index fa8281a..d65ec81 100644
--- a/system/TestNode.py
+++ b/system/TestNode.py
@@ -258,7 +258,7 @@ class TestNode:
             return True
         remote_log="%s/log.txt"%self.nodedir()
         local_log="logs/node.qemu.%s.txt"%self.name()
-        self.test_box().test_ssh.fetch(remote_log,local_log)
+        self.test_box().test_ssh.fetch(remote_log,local_log,dry_run=self.dry_run())
 
     def keys_clear_known_hosts (self):
         "remove test nodes entries from the local known_hosts file"