Minor fixes to try scheduler and its integration tests

buildbot · Dec 25, 2013 · 25ae2d7 · 25ae2d7
1 parent 48a1dbc
commit 25ae2d7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/master/buildbot/schedulers/trysched.py b/master/buildbot/schedulers/trysched.py
@@ -214,6 +214,7 @@ def handleJobFile(self, filename, f):
             comment = parsed_job['comment']
 
         sourcestamp = dict(branch=parsed_job['branch'],
+                           codebase='',
                            revision=parsed_job['baserev'],
                            patch_body=parsed_job['patch_body'],
                            patch_level=parsed_job['patch_level'],

diff --git a/master/buildbot/test/integration/test_try_client.py b/master/buildbot/test/integration/test_try_client.py
@@ -188,7 +188,10 @@ def startMaster(self, sch, startSlave=False, wantPBListener=False):
         self.failIf(mock_reactor.stop.called,
                     "startService tried to stop the reactor; check logs")
 
-        # hang out until the scheduler has registered its PB port
+        # wait until the scheduler is active
+        yield waitFor(lambda: self.sch.active)
+
+        # and, for Try_Userpass, until it's registered its port
         if isinstance(self.sch, trysched.Try_Userpass):
             def getSchedulerPort():
                 if not self.sch.registrations:
@@ -246,7 +249,7 @@ def test_userpass_wait(self):
             'Delivering job; comment= None',
             'job has been delivered',
             'All Builds Complete',
-            'a: success (build successful)',
+            'a: success (build successful one two)',
         ])
         buildsets = yield self.master.db.buildsets.getBuildsets()
         self.assertEqual(len(buildsets), 1)

diff --git a/master/buildbot/test/unit/test_schedulers_trysched.py b/master/buildbot/test/unit/test_schedulers_trysched.py
@@ -540,6 +540,7 @@ def check(_):
                     sourcestamps=[
                         dict(
                             branch='trunk',
+                            codebase='',
                             patch_author='who',
                             patch_body='this is my diff, -- ++, etc.',
                             patch_comment='comment',
@@ -592,6 +593,7 @@ def check(_):
                     sourcestamps=[
                         dict(
                             branch='trunk',
+                            codebase='',
                             patch_author='who',
                             patch_body='this is my diff, -- ++, etc.',
                             patch_comment='comment',
@@ -619,6 +621,7 @@ def check(_):
                     sourcestamps=[
                         dict(
                             branch='trunk',
+                            codebase='',
                             patch_author='who',
                             patch_body='this is my diff, -- ++, etc.',
                             patch_comment='comment',
@@ -705,6 +708,7 @@ def check(_):
                     sourcestamps=[
                         dict(
                             branch='default',
+                            codebase='',
                             patch_author='',
                             patch_body='-- ++',
                             patch_comment='',
@@ -733,6 +737,7 @@ def check(_):
                     sourcestamps=[
                         dict(
                             branch='default',
+                            codebase='',
                             patch_author='who',
                             patch_body='-- ++',
                             patch_comment='comment',