Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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...
commit e9b86f3f73447a20866ac24f8b5b86a44191b8a0 2 parents 5ef859a + b17b9cd
ccooper authored February 28, 2012
5  changes/hgpoller.py
@@ -425,13 +425,15 @@ class HgAllLocalesPoller(base.ChangeSource, BasePoller):
425 425
     parallelRequests = 2
426 426
     verboseChilds = False
427 427
 
428  
-    def __init__(self, hgURL, repositoryIndex, pollInterval=120):
  428
+    def __init__(self, hgURL, repositoryIndex, pollInterval=120, branch=None):
429 429
         """
430 430
         @type  repositoryIndex:      string
431 431
         @param repositoryIndex:      The URL listing all locale repos
432 432
         @type  pollInterval        int
433 433
         @param pollInterval        The time (in seconds) between queries for
434 434
                                    changes
  435
+        @type  branch:      string
  436
+        @param branch:      Used by caller to uniquely identify this object
435 437
         """
436 438
 
437 439
         BasePoller.__init__(self)
@@ -444,6 +446,7 @@ def __init__(self, hgURL, repositoryIndex, pollInterval=120):
444 446
         self.locales = []
445 447
         self.pendingLocales = []
446 448
         self.activeRequests = 0
  449
+        self.branch = branch
447 450
 
448 451
     def startService(self):
449 452
         self.loop = LoopingCall(self.poll)
6  misc.py
@@ -789,7 +789,8 @@ def generateBranchObjects(config, name, secrets=None):
789 789
     if config['enable_l10n'] and config['enable_l10n_onchange']:
790 790
         hg_all_locales_poller = HgAllLocalesPoller(hgURL = config['hgurl'],
791 791
                             repositoryIndex = config['l10n_repo_path'],
792  
-                            pollInterval=l10nPollInterval)
  792
+                            pollInterval=l10nPollInterval,
  793
+                            branch=name)
793 794
         hg_all_locales_poller.parallelRequests = 1
794 795
         branchObjects['change_source'].append(hg_all_locales_poller)
795 796
 
@@ -2054,7 +2055,8 @@ def generateCCBranchObjects(config, name, secrets=None):
2054 2055
     if config['enable_l10n'] and config['enable_l10n_onchange']:
2055 2056
         hg_all_locales_poller = HgAllLocalesPoller(hgURL = config['hgurl'],
2056 2057
                             repositoryIndex = config['l10n_repo_path'],
2057  
-                            pollInterval=l10nPollInterval)
  2058
+                            pollInterval=l10nPollInterval,
  2059
+                            branch=name)
2058 2060
         hg_all_locales_poller.parallelRequests = 1
2059 2061
         branchObjects['change_source'].append(hg_all_locales_poller)
2060 2062
 
4  process/factory.py
@@ -50,7 +50,7 @@
50 50
 reload(release.paths)
51 51
 
52 52
 from buildbotcustom.status.errors import purge_error, global_errors, \
53  
-  upload_errors, tegra_errors
  53
+  upload_errors
54 54
 from buildbotcustom.steps.base import ShellCommand, SetProperty, Mercurial, \
55 55
   Trigger, RetryingShellCommand, RetryingSetProperty
56 56
 from buildbotcustom.steps.misc import TinderboxShellCommand, SendChangeStep, \
@@ -7063,7 +7063,6 @@ def addSetupSteps(self):
7063 7063
             command=['python', '/builds/sut_tools/cleanup.py',
7064 7064
                      WithProperties("%(sut_ip)s"),
7065 7065
                     ],
7066  
-            log_eval_func=lambda c,s: regex_log_evaluator(c, s, tegra_errors),
7067 7066
             haltOnFailure=True)
7068 7067
         )
7069 7068
         self.addStep(ShellCommand(
@@ -7419,7 +7418,6 @@ def addCleanupSteps(self):
7419 7418
                          WithProperties("%(sut_ip)s"),
7420 7419
                         ],
7421 7420
                 env=self.env,
7422  
-                log_eval_func=lambda c,s: regex_log_evaluator(c, s, tegra_errors),
7423 7421
                 haltOnFailure=True)
7424 7422
             )
7425 7423
         if not self.remoteTests:
4  status/errors.py
@@ -25,7 +25,3 @@
25 25
                  (re.compile("Connection refused"), RETRY),
26 26
                  (re.compile("Connection reset by peer"), RETRY),
27 27
                 )
28  
-
29  
-tegra_errors = ((re.compile("process killed by signal 9"), RETRY),
30  
-                (re.compile("process killed by signal 15"), RETRY),
31  
-               )
2  test/test_hgpoller.py
@@ -70,7 +70,7 @@ def testUrlWithUnicodeLastChangeset(self):
70 70
 
71 71
 class FakeHgAllLocalesPoller(HgAllLocalesPoller):
72 72
     def __init__(self):
73  
-        HgAllLocalesPoller.__init__(self, hgURL='fake', repositoryIndex='fake')
  73
+        HgAllLocalesPoller.__init__(self, hgURL='fake', repositoryIndex='fake', branch='fake')
74 74
 
75 75
     def pollNextLocale(self):
76 76
         pass

0 notes on commit e9b86f3

Please sign in to comment.
Something went wrong with that request. Please try again.