fix typos and docs and merge error

buildbot · Jun 24, 2012 · ba8a878 · ba8a878
1 parent 3e9a048
commit ba8a878
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/master/buildbot/schedulers/base.py b/master/buildbot/schedulers/base.py
@@ -325,7 +325,7 @@ def addBuildsetForLatest(self, reason='', external_idstring=None,
 
 
     @defer.inlineCallbacks
-    def addBuildSetForSourceStampDetails(self, reason='', external_idstring=None,
+    def addBuildsetForSourceStampDetails(self, reason='', external_idstring=None,
                         branch=None, repository='', project='', revision=None,
                         builderNames=None, properties=None):
         """

diff --git a/master/buildbot/schedulers/forcesched.py b/master/buildbot/schedulers/forcesched.py
@@ -299,7 +299,7 @@ def force(self, owner, builder_name, **kwargs):
         r = ("A build was forced by '%s': %s" % (owner, reason))
 
         # everything is validated, we can create our source stamp, and buildrequest
-        res = yield self.addBuildSetForSourceStampDetails(
+        res = yield self.addBuildsetForSourceStampDetails(
             reason = r,
             branch = branch,
             repository = repository,

diff --git a/master/buildbot/schedulers/triggerable.py b/master/buildbot/schedulers/triggerable.py
@@ -46,7 +46,8 @@ def trigger(self, sourcestamps = None, set_props=None):
         # note that this does not use the buildset subscriptions mechanism, as
         # the duration of interest to the caller is bounded by the lifetime of
         # this process.
-        d = self.addBuildsetForSourceStampDetails(self.reason, sourcestamps, props)
+        d = self.addBuildsetForSourceStampSetDetails(self.reason,
+                                                sourcestamps, props)
         def setup_waiter((bsid,brids)):
             d = defer.Deferred()
             self._waiters[bsid] = (d, brids)

diff --git a/master/buildbot/test/unit/test_schedulers_timed_Nightly.py b/master/buildbot/test/unit/test_schedulers_timed_Nightly.py
@@ -13,6 +13,7 @@
 #
 # Copyright Buildbot Team Members
 
+import time
 import mock
 from twisted.trial import unittest
 from twisted.internet import defer, task

diff --git a/master/docs/manual/cfg-schedulers.rst b/master/docs/manual/cfg-schedulers.rst
@@ -413,10 +413,10 @@ between builds, not the absolute time-of-day of each Build, so this
 could easily wind up an *evening* or *every afternoon* scheduler
 depending upon when it was first activated.
 
-.. _Nightly-Scheduler:
-
 .. bb:sched:: Nightly
 
+.. _Nightly-Scheduler:
+
 Nightly Scheduler
 ~~~~~~~~~~~~~~~~~
 
@@ -747,10 +747,12 @@ Here is a fully-worked example::
                                          waitForFinish=True))
 
 
+.. bb:sched:: NightlyTriggerable
+
 NightlyTriggerable Scheduler
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. py:clas:: buildbot.schedulers.timed.NightlyTriggerable
+.. py:class:: buildbot.schedulers.timed.NightlyTriggerable
 
 The :class:`NightlyTriggerable` scheduler is a mix of the :class:`Nightly` and :class:`Triggerable` schedulers.
 This scheduler triggers builds at a particular time of day, week, or year, exactly as the :class:`Nightly` scheduler.
@@ -776,7 +778,7 @@ The parameters are just the basics:
 ``month``
 
 ``dayOfWeek``
-    See :ref:`Nightly Scheduler`.
+    See :bb:sched:`Nightly`.
 
 This class is only useful in conjunction with the :class:`Trigger` step.
 Note that ``waitForFinish`` is ignored by :class:`Trigger` steps targeting this scheduler.