Permalink
Browse files

Merging from default

changeset:   2137:1c013999a930
parent:      2135:b369c714ede6
user:        John Hopkins <jhopkins@mozilla.com>
date:        Tue Feb 28 15:43:16 2012 -0500
summary:     Bug 731362 - HgAllLocalesPoller needs a branch attribute. r=bhearsum

changeset:   2138:5f1e278ddad0
tag:         tip
user:        Phil Ringnalda <philringnalda@gmail.com>
date:        Tue Feb 28 19:43:34 2012 -0800
summary:     Back out 1c11026036ff (bug 660480) for being wishful thinking that did more harm than good

--HG--
branch : production-0.8
  • Loading branch information...
2 parents 5ef859a + b17b9cd commit e9b86f3f73447a20866ac24f8b5b86a44191b8a0 @ccooper ccooper committed Feb 29, 2012
Showing with 10 additions and 11 deletions.
  1. +4 −1 changes/hgpoller.py
  2. +4 −2 misc.py
  3. +1 −3 process/factory.py
  4. +0 −4 status/errors.py
  5. +1 −1 test/test_hgpoller.py
View
@@ -425,13 +425,15 @@ class HgAllLocalesPoller(base.ChangeSource, BasePoller):
parallelRequests = 2
verboseChilds = False
- def __init__(self, hgURL, repositoryIndex, pollInterval=120):
+ def __init__(self, hgURL, repositoryIndex, pollInterval=120, branch=None):
"""
@type repositoryIndex: string
@param repositoryIndex: The URL listing all locale repos
@type pollInterval int
@param pollInterval The time (in seconds) between queries for
changes
+ @type branch: string
+ @param branch: Used by caller to uniquely identify this object
"""
BasePoller.__init__(self)
@@ -444,6 +446,7 @@ def __init__(self, hgURL, repositoryIndex, pollInterval=120):
self.locales = []
self.pendingLocales = []
self.activeRequests = 0
+ self.branch = branch
def startService(self):
self.loop = LoopingCall(self.poll)
View
@@ -789,7 +789,8 @@ def generateBranchObjects(config, name, secrets=None):
if config['enable_l10n'] and config['enable_l10n_onchange']:
hg_all_locales_poller = HgAllLocalesPoller(hgURL = config['hgurl'],
repositoryIndex = config['l10n_repo_path'],
- pollInterval=l10nPollInterval)
+ pollInterval=l10nPollInterval,
+ branch=name)
hg_all_locales_poller.parallelRequests = 1
branchObjects['change_source'].append(hg_all_locales_poller)
@@ -2054,7 +2055,8 @@ def generateCCBranchObjects(config, name, secrets=None):
if config['enable_l10n'] and config['enable_l10n_onchange']:
hg_all_locales_poller = HgAllLocalesPoller(hgURL = config['hgurl'],
repositoryIndex = config['l10n_repo_path'],
- pollInterval=l10nPollInterval)
+ pollInterval=l10nPollInterval,
+ branch=name)
hg_all_locales_poller.parallelRequests = 1
branchObjects['change_source'].append(hg_all_locales_poller)
View
@@ -50,7 +50,7 @@
reload(release.paths)
from buildbotcustom.status.errors import purge_error, global_errors, \
- upload_errors, tegra_errors
+ upload_errors
from buildbotcustom.steps.base import ShellCommand, SetProperty, Mercurial, \
Trigger, RetryingShellCommand, RetryingSetProperty
from buildbotcustom.steps.misc import TinderboxShellCommand, SendChangeStep, \
@@ -7063,7 +7063,6 @@ def addSetupSteps(self):
command=['python', '/builds/sut_tools/cleanup.py',
WithProperties("%(sut_ip)s"),
],
- log_eval_func=lambda c,s: regex_log_evaluator(c, s, tegra_errors),
haltOnFailure=True)
)
self.addStep(ShellCommand(
@@ -7419,7 +7418,6 @@ def addCleanupSteps(self):
WithProperties("%(sut_ip)s"),
],
env=self.env,
- log_eval_func=lambda c,s: regex_log_evaluator(c, s, tegra_errors),
haltOnFailure=True)
)
if not self.remoteTests:
View
@@ -25,7 +25,3 @@
(re.compile("Connection refused"), RETRY),
(re.compile("Connection reset by peer"), RETRY),
)
-
-tegra_errors = ((re.compile("process killed by signal 9"), RETRY),
- (re.compile("process killed by signal 15"), RETRY),
- )
@@ -70,7 +70,7 @@ def testUrlWithUnicodeLastChangeset(self):
class FakeHgAllLocalesPoller(HgAllLocalesPoller):
def __init__(self):
- HgAllLocalesPoller.__init__(self, hgURL='fake', repositoryIndex='fake')
+ HgAllLocalesPoller.__init__(self, hgURL='fake', repositoryIndex='fake', branch='fake')
def pollNextLocale(self):
pass

0 comments on commit e9b86f3

Please sign in to comment.