From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 21 Sep 2011 09:13:27 +0000 (+0200)
Subject: fix parsing of timestamp
X-Git-Tag: tests-5.0-29~16
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=04dd4013ae7ba929428ad410e34d81743fe1f953;p=tests.git

fix parsing of timestamp
---

diff --git a/system/Substrate.py b/system/Substrate.py
index bf8551c..06eaf3e 100644
--- a/system/Substrate.py
+++ b/system/Substrate.py
@@ -455,10 +455,11 @@ class PlcBox (Box):
         ts_lines=self.backquote_ssh(command,trash_err=True).split('\n')
         for ts_line in ts_lines:
             if not ts_line.strip(): continue
-            # expect /vservers/<vservername>/timestamp:<timestamp>
+            # expect /vservers/<vservername>.timestamp:<timestamp>
             try:
-                (_,__,vservername,tail)=ts_line.split('/')
-                (_,timestamp)=tail.split(':')
+                (ts_file,timestamp)=ts_line.split(':')
+                ts_file=os.path.basename(ts_file)
+                (vservername,_)=os.path.splitext(ts_file)
                 timestamp=int(timestamp)
                 p=self.plc_instance_by_vservername(vservername)
                 if not p: