[Buildbot-commits] buildbot/buildbot/test test_run.py, 1.48, 1.49 test_slaves.py, 1.13, 1.14

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10439/buildbot/test

Modified Files:
	test_run.py test_slaves.py 
Log Message:
[project @ fix fix test failures on Twisted-2.0.x, double calls to master.stopService]

Original author: warner at lothar.com
Date: 2007-08-07 20:22:40+00:00

Index: test_run.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_run.py,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- test_run.py	7 Aug 2007 19:48:54 -0000	1.48
+++ test_run.py	7 Aug 2007 20:23:46 -0000	1.49
@@ -158,9 +158,6 @@
         else:
             self.failUnlessEqual(bs.state, IDLE)
 
-        d = defer.maybeDeferred(self.master.stopService)
-        return d
-
 class Ping(RunMixin, unittest.TestCase):
     def testPing(self):
         self.master.loadConfig(config_2)

Index: test_slaves.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_slaves.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- test_slaves.py	7 Aug 2007 20:23:39 -0000	1.13
+++ test_slaves.py	7 Aug 2007 20:23:46 -0000	1.14
@@ -467,7 +467,6 @@
             self.failUnless(len(bs.slavebuilders) == 3)
             self.failUnless(b in [sb.builder for sb in bs.slavebuilders])
 
-            return self.master.stopService()
         d.addCallback(_check)
         return d