From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 30 May 2013 10:56:08 +0000 (+0200)
Subject: improve handling of unreachable boxes
X-Git-Tag: tests-5.2-4~3
X-Git-Url: http://git.onelab.eu/?p=tests.git;a=commitdiff_plain;h=b6bfb4993976c3cc9a54f4b3f33bd965772de2c9

improve handling of unreachable boxes
---

diff --git a/system/Substrate.py b/system/Substrate.py
index b8c622a..773e750 100644
--- a/system/Substrate.py
+++ b/system/Substrate.py
@@ -286,21 +286,24 @@ class Box:
         else:
             probe_argv=self.test_ssh().actual_argv(composite_command)
         composite=self.backquote ( probe_argv, trash_err=True )
-        if not composite: print "root@%s unreachable"%self.hostname
         self._hostname = self._uptime = self._uname = self._fedora = "** Unknown **"
-        try:
-            pieces = composite.split(Box.separator)
-            pieces = [ x.strip() for x in pieces ]
-            [self._hostname, self._uptime, self._uname, self._fedora] = pieces
-            # customize
-            self._uptime = ', '.join([ x.strip() for x in self._uptime.split(',')[2:]])
-            self._fedora = self._fedora.replace("Fedora release ","f").split(" ")[0]
-        except:
-            import traceback
-            print 'BEG issue with pieces',pieces
-            traceback.print_exc()
-            print 'END issue with pieces',pieces
-        self._probed=self._hostname
+        if not composite: 
+            print "root@%s unreachable"%self.hostname
+            self._probed=''
+        else:
+            try:
+                pieces = composite.split(Box.separator)
+                pieces = [ x.strip() for x in pieces ]
+                [self._hostname, self._uptime, self._uname, self._fedora] = pieces
+                # customize
+                self._uptime = ', '.join([ x.strip() for x in self._uptime.split(',')[2:]])
+                self._fedora = self._fedora.replace("Fedora release ","f").split(" ")[0]
+            except:
+                import traceback
+                print 'BEG issue with pieces',pieces
+                traceback.print_exc()
+                print 'END issue with pieces',pieces
+            self._probed=self._hostname
         return self._probed
 
     # use argv=['bash','-c',"the command line"]