Permalink
Browse files

merge from default -> production-0.8

$ hg merge -r default -P
changeset:   2973:766a067f74a7
tag:         tip
parent:      2971:163d9fc9dfe4
user:        Chris AtLee <catlee@mozilla.com>
date:        Tue Feb 05 10:11:11 2013 -0500
summary:     Bug 822039: Decrease timeout for talos_from_code.py and add a RETRY. r=rail

--HG--
branch : production-0.8
  • Loading branch information...
2 parents 4d39e93 + 24f97ea commit 8c6a3bc797ce85fda4412e15e1b8bb846a23f3dc @Callek Callek committed Feb 5, 2013
Showing with 2 additions and 0 deletions.
  1. +1 −0 process/factory.py
  2. +1 −0 status/errors.py
View
1 process/factory.py
@@ -5887,6 +5887,7 @@ def addSetupSteps(self):
haltOnFailure=True,
log_eval_func=lambda c, s: regex_log_evaluator(
c, s, talos_hgweb_errors),
+ timeout=60,
))
else:
self.addStep(DownloadFile(
View
1 status/errors.py
@@ -30,6 +30,7 @@
talos_hgweb_errors = ((re.compile("ERROR 500: Internal Server Error"), RETRY),
(re.compile("ERROR: We tried to download the talos.json file but something failed"), RETRY),
+ (re.compile("command timed out:"), RETRY),
)
tegra_errors = (

0 comments on commit 8c6a3bc

Please sign in to comment.