[Buildbot-commits] buildbot/buildbot/test runutils.py,1.1,1.2 test_vc.py,1.35,1.36 test_slavecommand.py,1.16,1.17

[Brian Warner]

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

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

python2.2 compatibility, other minor stuff

	* buildbot/locks.py: added temporary id() numbers to Lock
	descriptions, to track down a not-really-sharing-the-Lock bug

	* buildbot/test/runutils.py: must import errno, cut-and-paste bug

	* buildbot/test/test_slavecommand.py (ShellBase.failUnlessIn):
	needed for python2.2 compatibility
	* buildbot/test/test_vc.py: python2.2 compatibility: generators
	are from the __future__


Index: runutils.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/runutils.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- runutils.py	19 Jul 2005 23:11:59 -0000	1.1
+++ runutils.py	20 Jul 2005 08:08:23 -0000	1.2
@@ -1,5 +1,5 @@
 
-import shutil, os
+import shutil, os, errno
 from twisted.internet import defer
 from twisted.python import log
 

Index: test_slavecommand.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_slavecommand.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- test_slavecommand.py	19 Jul 2005 19:49:36 -0000	1.16
+++ test_slavecommand.py	20 Jul 2005 08:08:24 -0000	1.17
@@ -56,6 +56,9 @@
     def setUp(self):
         self.builder = FakeSlaveBuilder(self.usePTY)
 
+    def failUnlessIn(self, substring, string):
+        self.failUnless(string.find(substring) != -1)
+
     def getfile(self, which):
         got = ""
         for r in self.builder.updates:

Index: test_vc.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_vc.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- test_vc.py	20 Jul 2005 02:18:22 -0000	1.35
+++ test_vc.py	20 Jul 2005 08:08:23 -0000	1.36
@@ -1,5 +1,7 @@
 # -*- test-case-name: buildbot.test.test_vc -*-
 
+from __future__ import generators
+
 import sys, os, signal, shutil, time
 from email.Utils import mktime_tz, parsedate_tz