Add missing codebase properties

Also, sourcestamp['codebase'] is a string, not a dict.
buildbot · Nov 5, 2014 · 3a1aa28 · 3a1aa28
1 parent 8af4cdf
commit 3a1aa28
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/master/buildbot/schedulers/timed.py b/master/buildbot/schedulers/timed.py
@@ -270,7 +270,7 @@ def __init__(self, name, builderNames, minute=0, hour='*',
                  codebases=base.BaseScheduler.DEFAULT_CODEBASES):
         if branch and branch is not Nightly.NoBranch:
             if codebases is base.BaseScheduler.DEFAULT_CODEBASES:
-                codebases = {'': {'repository': '', 'branch': branch}}
+                codebases = {'': {'repository': '', 'project': '', 'branch': branch, 'revision': ''}}
             else:
                 config.error("Nightly(%s): 'codebases' and 'branch' are mutually exclusive" % name)
         NightlyBase.__init__(self, name=name, builderNames=builderNames,
@@ -384,7 +384,7 @@ def startBuild(self):
                                                     less_than=max_changeid + 1)
         else:
             # start a build of the latest revision, whatever that is
-            ss = {'codebase': self.getCodebaseDict('')}
+            ss = {'codebase': ''}
             yield self.addBuildsetForSourceStampsWithDefaults(reason=self.reason,
                                                               sourcestamps=[ss])
 

diff --git a/master/buildbot/test/unit/test_schedulers_timed_Nightly.py b/master/buildbot/test/unit/test_schedulers_timed_Nightly.py
@@ -57,9 +57,10 @@ def addBuildsetForSourceStampsWithDefaults(reason, sourcestamps,
             self.assertIn('scheduler named', reason)
             isFirst = (self.events == [])
 
-            codebases = [ss['codebase'] for ss in sourcestamps] or [{}]  # default codebase
+            codebases = [ss['codebase'] for ss in sourcestamps] or ['']  # default codebase
+            codebase_dicts = map(sched.getCodebaseDict, codebases)
 
-            self.events.append('B(%s)@%d' % (''.join([str(cb.get('branch')) for cb in codebases]),
+            self.events.append('B(%s)@%d' % (''.join([str(cb.get('branch')) for cb in codebase_dicts]),
                                              # show the offset as seconds past the GMT hour
                                              self.clock.seconds() - self.localtime_offset))
             if isFirst and firstBuildDuration: