From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 21 Sep 2011 21:09:00 +0000 (+0200)
Subject: tweaks
X-Git-Tag: tests-5.0-29~11
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=83237d240e4a269cb965d44aca25fafead6afc60;p=tests.git

tweaks
---

diff --git a/system/Substrate.py b/system/Substrate.py
index 6441620..3d1bdef 100644
--- a/system/Substrate.py
+++ b/system/Substrate.py
@@ -657,7 +657,7 @@ class TestBox (Box):
         # can't reboot a vserver VM
         self.run_ssh (['pkill','run_log'],"Terminating current runs",
                       dry_run=options.dry_run)
-        self.run_ssh (['rm','-f','/root/starting'],"Cleaning /root/starting",
+        self.run_ssh (['rm','-f',Pool.starting],"Cleaning /root/starting",
                       dry_run=options.dry_run)
 
     def get_test (self, buildname):
@@ -677,7 +677,7 @@ class TestBox (Box):
     def sense (self, options):
         print 't',
         self.sense_uptime()
-        self.starting_ips=self.backquote_ssh(['cat','/root/starting']).strip().split('\n')
+        self.starting_ips=self.backquote_ssh(['cat',Pool.starting], trash_err=True).strip().split('\n')
         pids = self.backquote_ssh (['pgrep','run_log'],trash_err=True)
         if not pids: return
         command=['ls','-ld'] + ["/proc/%s/cwd"%pid for pid in pids.split("\n") if pid]