From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Mon, 3 Oct 2011 05:58:36 +0000 (+0200)
Subject: Retry more - retry retry retry
X-Git-Tag: nepi-3.0.0~176
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7cf48cdf39b271905e078b4be03d9b642c8c7f67;p=nepi.git

Retry more - retry retry retry
---

diff --git a/src/nepi/testbeds/planetlab/application.py b/src/nepi/testbeds/planetlab/application.py
index 767b8926..e8834393 100644
--- a/src/nepi/testbeds/planetlab/application.py
+++ b/src/nepi/testbeds/planetlab/application.py
@@ -474,7 +474,9 @@ class Dependency(object):
                     # but first wait for master
                     self._master.async_setup_wait()
                     self._launch_build(trial+1)
-                    self._do_wait_build(trial+1)
+                    return self._do_wait_build(trial+1)
+                elif trial < 3:
+                    return self._do_wait_build(trial+1)
                 else:
                     # No longer need'em
                     self._master_prk = None
@@ -1088,4 +1090,4 @@ class YumDependency(Dependency):
                            r'|MASTER NODE UNREACHABLE'
                            r')', 
                            re.I)
-        return badre.search(out) or badre.search(err)
+        return badre.search(out) or badre.search(err) or self.node.check_bad_host(out,err)