[Buildbot-commits] buildbot/buildbot/test test_vc.py,1.40,1.41

Brian Warner warner at users.sourceforge.net
Mon Aug 15 20:26:07 UTC 2005


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

Modified Files:
	test_vc.py 
Log Message:
Revision: arch at buildbot.sf.net--2004/buildbot--dev--0--patch-289
Creator:  Brian Warner <warner at lothar.com>

fix test_vc failures under twisted-1.3.0: avoid nested maybeWait

	* buildbot/test/test_vc.py (VCBase.tearDown): provide for
	tearDown2, so things like Arch can unregister archives as they're
	shutting down. The previous subclass-override-tearDown technique
	resulted in a nested maybeWait() and test failures under
	Twisted-1.3.0


Index: test_vc.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_vc.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- test_vc.py	15 Aug 2005 18:05:07 -0000	1.40
+++ test_vc.py	15 Aug 2005 20:26:05 -0000	1.41
@@ -907,8 +907,12 @@
                     from twisted.protocols import http # Twisted-1.3
                 http._logDateTimeStop() # shut down the internal timer. DUMB!
             d.addCallback(lambda res: stopHTTPTimer())
+        d.addCallback(lambda res: self.tearDown2())
         return maybeWait(d)
 
+    def tearDown2(self):
+        pass
+
 class CVSSupport(VCBase):
     metadir = "CVS"
     branchname = "branch"
@@ -1310,7 +1314,7 @@
     def postCreate(self, res):
         pass
 
-    def tearDown(self):
+    def tearDown2(self):
         if self.fixtimer:
             self.fixtimer.cancel()
         # tell tla to get rid of the leftover archive this test leaves in the
@@ -1319,8 +1323,7 @@
         # same name. We could use archive= to set it explicitly, but if you
         # change it from the default, then 'tla update' won't work.
         d = self.unregisterRepository()
-        d.addCallback(lambda res: VCBase.tearDown(self))
-        return maybeWait(d)
+        return d
 
     def vc_create(self):
         # pick a hopefully unique string for the archive name, in the form





More information about the Commits mailing list