From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 20 Sep 2011 08:51:21 +0000 (+0200)
Subject: ignore ps entries for builds.sh
X-Git-Tag: tests-5.0-29~30
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=29a6c33a869f65b85921bcca6053bf6eed66058d;p=tests.git

ignore ps entries for builds.sh
---

diff --git a/system/Substrate.py b/system/Substrate.py
index 8da463c..f63d6b4 100644
--- a/system/Substrate.py
+++ b/system/Substrate.py
@@ -301,6 +301,7 @@ class BuildBox (Box):
         return '*undef* uptime'
 
     # inspect box and find currently running builds
+    matcher_exclude=re.compile(".*builds\.sh.*")
     matcher=re.compile("\s*(?P<pid>[0-9]+).*-[bo]\s+(?P<buildname>[^\s]+)(\s|\Z)")
     def sense(self,reboot=False,verbose=True):
         if reboot:
@@ -316,6 +317,7 @@ class BuildBox (Box):
         ps_lines=self.backquote_ssh (command).split('\n')
         for line in ps_lines:
             if not line.strip() or line.find('PID')>=0: continue
+            if BuildBox.matcher_exclude.match(line): continue
             m=BuildBox.matcher.match(line)
             if m: 
                 date=time.strftime('%Y-%m-%d',time.localtime(time.time()))