[Buildbot-commits] buildbot/buildbot/test test_maildir.py,1.4,1.5

[Brian Warner]

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

Modified Files:
	test_maildir.py 
Log Message:
(MaildirTest): rename the 'timeout' method, as it collides with trial's
internals


Index: test_maildir.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_maildir.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- test_maildir.py	24 Apr 2005 21:30:25 -0000	1.4
+++ test_maildir.py	13 Mar 2006 05:48:35 -0000	1.5
@@ -38,7 +38,7 @@
         # to do this right, use safecat
         shutil.copy(msg, newdir)
 
-    def timeout(self):
+    def do_timeout(self):
         self.done = 1
 
     def testMaildir(self):
@@ -55,7 +55,7 @@
             msg = testfiles[i]
             reactor.callLater(2*i, self.deliverMail,
                               os.path.join(testfiles_dir, msg))
-        t = reactor.callLater(2*i + 15, self.timeout)
+        t = reactor.callLater(2*i + 15, self.do_timeout)
         while not (self.done or len(self.changes) == count):
             reactor.iterate(0.1)
         s.stopService()