1 files changed, 91 insertions, 0 deletions
diff --git a/buildbot/buildbot/test/test_reconfig.py b/buildbot/buildbot/test/test_reconfig.py
new file mode 100644
index 0000000..c4c3922
--- /dev/null
+++ b/buildbot/buildbot/test/test_reconfig.py
@@ -0,0 +1,91 @@
+from twisted.trial import unittest
+from twisted.internet import reactor, defer
+from twisted.python import log
+
+from buildbot.test.runutils import RunMixin
+from buildbot.sourcestamp import SourceStamp
+
+config_base = """
+from buildbot.process import factory
+from buildbot.steps import dummy
+from buildbot.buildslave import BuildSlave
+from buildbot.scheduler import Triggerable, Dependent
+
+BuildmasterConfig = c = {}
+
+f = factory.BuildFactory()
+f.addStep(dummy.Dummy, timeout=%d)
+
+c['slaves'] = [BuildSlave('bot1', 'sekrit')]
+
+upstream = Triggerable('s_upstream', ['upstream'], {'prop': '%s'})
+dep = Dependent('s_dep', upstream, ['depend'], {'dep prop': '%s'})
+c['schedulers'] = [upstream, dep]
+c['builders'] = [{'name':'upstream', 'slavename':'bot1',
+                  'builddir': 'upstream', 'factory': f},
+                 {'name':'depend', 'slavename':'bot1',
+                  'builddir': 'depend', 'factory': f}]
+c['slavePortnum'] = 0
+"""
+
+class DependingScheduler(RunMixin, unittest.TestCase):
+    '''Test an upstream and a dependent scheduler while reconfiguring.'''
+
+    def testReconfig(self):
+        self.reconfigured = 0
+        self.master.loadConfig(config_base % (1, 'prop value', 'dep prop value'))
+        self.prop_value = 'prop value'
+        self.dep_prop_value = 'dep prop value'
+        self.master.readConfig = True
+        self.master.startService()
+        d = self.connectSlave(builders=['upstream', 'depend'])
+        d.addCallback(self._triggerUpstream)
+        return d
+    def _triggerUpstream(self, res):
+        log.msg("trigger upstream")
+        ss = SourceStamp()
+        upstream = [s for s in self.master.allSchedulers()
+                    if s.name == 's_upstream'][0]
+        d = upstream.trigger(ss)
+        d.addCallback(self._gotBuild)
+        return d
+
+    def _gotBuild(self, res):
+        log.msg("done")
+        d = defer.Deferred()
+        d.addCallback(self._doChecks)
+        reactor.callLater(2, d.callback, None)
+        return d
+
+    def _doChecks(self, res):
+        log.msg("starting tests")
+        ub = self.status.getBuilder('upstream').getLastFinishedBuild()
+        tb = self.status.getBuilder('depend').getLastFinishedBuild()
+        self.assertEqual(ub.getProperty('prop'), self.prop_value)
+        self.assertEqual(ub.getNumber(), self.reconfigured)
+        self.assertEqual(tb.getProperty('dep prop'), self.dep_prop_value)
+        self.assertEqual(tb.getNumber(), self.reconfigured)
+
+        # now further on to the reconfig
+        if self.reconfigured > 2:
+            # actually, we're done, 
+            return
+        if self.reconfigured == 0:
+            # reconfig without changes now
+            d = self.master.loadConfig(config_base% (1, 'prop value',
+                                                     'dep prop value'))
+        elif self.reconfigured == 1:
+            # reconfig with changes to upstream now
+            d = self.master.loadConfig(config_base% (1, 'other prop value',
+                                                     'dep prop value'))
+            self.prop_value = 'other prop value'
+            self.dep_prop_value = 'dep prop value'
+        else:
+            # reconfig with changes to dep now
+            d = self.master.loadConfig(config_base% (1, 'other prop value',
+                                                     'other dep prop value'))
+            self.prop_value = 'other prop value'
+            self.dep_prop_value = 'other dep prop value'
+        self.reconfigured += 1
+        d.addCallback(self._triggerUpstream)
+        return d