[Buildbot-commits] buildbot/buildbot/test test_web.py,1.10,1.11 test_vc.py,1.25,1.26 test_twisted.py,1.4,1.5 test_runner.py,1.1,1.2 test_run.py,1.25,1.26 test_control.py,1.4,1.5
Brian Warner
warner at users.sourceforge.net
Tue Apr 26 09:43:25 UTC 2005
Update of /cvsroot/buildbot/buildbot/buildbot/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8738/buildbot/test
Modified Files:
test_web.py test_vc.py test_twisted.py test_runner.py
test_run.py test_control.py
Log Message:
* buildbot/test/test_control.py (Force.rmtree): python2.2
compatibility, apparently its shutil.rmtree ignore_errors=
argument is ignored.
* buildbot/test/test_run.py (Run.rmtree): same
(RunMixin.setUp): same
* buildbot/test/test_runner.py (make): python2.2 has os.sep but
not os.path.sep
* buildbot/test/test_twisted.py (Parse.failUnlessIn): 2.2 has no
'substring in string' operator, must use string.find(substr)!=-1
* buildbot/test/test_vc.py (Patch.failUnlessIn): same
* buildbot/test/test_web.py (WebTest.failUnlessIn): same
Index: test_control.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_control.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- test_control.py 24 Apr 2005 21:30:25 -0000 1.4
+++ test_control.py 26 Apr 2005 09:43:20 -0000 1.5
@@ -1,6 +1,6 @@
# -*- test-case-name: buildbot.test.test_control -*-
-import sys, os, signal, shutil, time
+import sys, os, signal, shutil, time, errno
from twisted.trial import unittest
dr = unittest.deferredResult
@@ -52,14 +52,22 @@
class Force(unittest.TestCase):
+ def rmtree(self, d):
+ try:
+ shutil.rmtree(d, ignore_errors=1)
+ except OSError, e:
+ # stupid 2.2 appears to ignore ignore_errors
+ if e.errno != errno.ENOENT:
+ raise
+
def setUp(self):
self.master = None
self.slave = None
- shutil.rmtree("control_basedir", ignore_errors=1)
+ self.rmtree("control_basedir")
os.mkdir("control_basedir")
self.master = master.BuildMaster("control_basedir")
self.slavebase = os.path.abspath("control_slavebase")
- shutil.rmtree(self.slavebase, ignore_errors=1)
+ self.rmtree(self.slavebase)
os.mkdir("control_slavebase")
def connectSlave(self):
Index: test_run.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_run.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- test_run.py 26 Apr 2005 07:16:35 -0000 1.25
+++ test_run.py 26 Apr 2005 09:43:20 -0000 1.26
@@ -4,7 +4,7 @@
dr = unittest.deferredResult
from twisted.internet import reactor, defer
from twisted.python import log
-import sys, os, shutil, time
+import sys, os, shutil, time, errno
#log.startLogging(sys.stderr)
from buildbot import master, interfaces
@@ -209,8 +209,16 @@
self.announce()
class Run(unittest.TestCase):
+ def rmtree(self, d):
+ try:
+ shutil.rmtree(d, ignore_errors=1)
+ except OSError, e:
+ # stupid 2.2 appears to ignore ignore_errors
+ if e.errno != errno.ENOENT:
+ raise
+
def testMaster(self):
- shutil.rmtree("basedir", ignore_errors=1)
+ self.rmtree("basedir")
os.mkdir("basedir")
m = master.BuildMaster("basedir")
m.loadConfig(config_1)
@@ -231,10 +239,18 @@
slave = None
slave2 = None
+ def rmtree(self, d):
+ try:
+ shutil.rmtree(d, ignore_errors=1)
+ except OSError, e:
+ # stupid 2.2 appears to ignore ignore_errors
+ if e.errno != errno.ENOENT:
+ raise
+
def setUp(self):
- shutil.rmtree("basedir", ignore_errors=1)
- shutil.rmtree("slavebase", ignore_errors=1)
- shutil.rmtree("slavebase2", ignore_errors=1)
+ self.rmtree("basedir")
+ self.rmtree("slavebase")
+ self.rmtree("slavebase2")
os.mkdir("basedir")
self.master = master.BuildMaster("basedir")
Index: test_runner.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_runner.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- test_runner.py 26 Apr 2005 09:14:10 -0000 1.1
+++ test_runner.py 26 Apr 2005 09:43:20 -0000 1.2
@@ -17,13 +17,13 @@
def make(self, d, key):
# we use a wacky filename here in case the test code discovers the
# user's real ~/.buildbot/ directory
- os.makedirs(os.path.sep.join(d + [".buildbot"]))
- f = open(os.path.sep.join(d + [".buildbot", self.optionsFile]), "w")
+ os.makedirs(os.sep.join(d + [".buildbot"]))
+ f = open(os.sep.join(d + [".buildbot", self.optionsFile]), "w")
f.write("key = '%s'\n" % key)
f.close()
def check(self, d, key=None):
- basedir = os.path.sep.join(d)
+ basedir = os.sep.join(d)
options = runner.loadOptions(basedir, self.optionsFile)
if key is None:
self.failIf(options.has_key('key'))
Index: test_twisted.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_twisted.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- test_twisted.py 24 Apr 2005 21:30:25 -0000 1.4
+++ test_twisted.py 26 Apr 2005 09:43:19 -0000 1.5
@@ -126,6 +126,9 @@
self.assertEquals(count, self.count(total=None))
class Parse(unittest.TestCase):
+ def failUnlessIn(self, substr, string):
+ self.failUnless(string.find(substr) != -1)
+
def testParse(self):
t = MyTrial(build=None, workdir=".", testpath=None, testChanges=True)
t.results = []
@@ -141,7 +144,7 @@
"FlowTest", "testProtocolLocalhost"))
self.failUnlessEqual(results, builder.SKIPPED)
self.failUnlessEqual(text, ['skipped'])
- self.failUnless("XXX freezes, fixme" in logs)
+ self.failUnlessIn("XXX freezes, fixme", logs)
self.failUnless(logs.startswith("SKIPPED:"))
self.failUnless(logs.endswith("fixme\n"))
@@ -161,7 +164,7 @@
self.failUnlessEqual(results, builder.SUCCESS)
self.failUnlessEqual(text, ['expected', 'failure'])
self.failUnless(logs.startswith("EXPECTED FAILURE: "))
- self.failUnless("\nTraceback " in logs)
+ self.failUnlessIn("\nTraceback ", logs)
self.failUnless(logs.endswith("layout differs from 'SlottedClass'\n"))
testname, results, text, logs = r4
@@ -171,6 +174,6 @@
self.failUnlessEqual(results, builder.FAILURE)
self.failUnlessEqual(text, ['failure'])
self.failUnless(logs.startswith("FAILURE: "))
- self.failUnless("Traceback " in logs)
+ self.failUnlessIn("Traceback ", logs)
self.failUnless(logs.endswith("'testRenameFile', 'testfile1']\n"))
Index: test_vc.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_vc.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- test_vc.py 24 Apr 2005 21:30:25 -0000 1.25
+++ test_vc.py 26 Apr 2005 09:43:17 -0000 1.26
@@ -79,7 +79,7 @@
log.msg("running svn --version..")
v = dr(utils.getProcessOutput('svn', ["--version"],
env=os.environ))
- if "handles 'file' schema" in v:
+ if v.find("handles 'file' schema") != -1:
self.have['svn'] = True
else:
log.msg(("%s found but it does not support 'file:' " +
@@ -412,6 +412,8 @@
os.system("tla register-archive -d test at buildbot.sf.net--testvc")
class Patch(SetupMixin, unittest.TestCase):
+ def failUnlessIn(self, substr, string):
+ self.failUnless(string.find(substr) != -1)
def doPatch(self, vc, revision, **kwargs):
m = self.master
@@ -435,8 +437,8 @@
f = open(os.path.join(self.slavebase, "vc-dir", "build", "good.c"),
"r")
data = f.read()
- self.failUnless("this is a hello-world program" in data)
- self.failUnless("Hello, world.\\n" in data)
+ self.failUnlessIn("this is a hello-world program", data)
+ self.failUnlessIn("Hello, world.\\n", data)
# make sure that a rebuild does not use the leftover patched workdir
build.setSourceStamp(None, None)
@@ -451,7 +453,7 @@
f = open(os.path.join(self.slavebase, "vc-dir", "build", "good.c"),
"r")
data = f.read()
- self.failUnless("Hello world\\n" in data) # no comma
+ self.failUnlessIn("Hello world\\n", data) # no comma
def testPatchCVS(self):
Index: test_web.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_web.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- test_web.py 26 Apr 2005 06:32:08 -0000 1.10
+++ test_web.py 26 Apr 2005 09:43:16 -0000 1.11
@@ -70,6 +70,9 @@
class WebTest(unittest.TestCase):
+ def failUnlessIn(self, substr, string):
+ self.failUnless(string.find(substr) != -1)
+
def tearDown(self):
# grr.
from twisted.protocols import http
@@ -180,8 +183,8 @@
d = client.getPage("http://localhost:%d/" % port)
page = dr(d)
self.failUnless(page)
- self.failUnless("current activity" in page)
- self.failUnless("<html>" in page)
+ self.failUnlessIn("current activity", page)
+ self.failUnlessIn("<html>", page)
d = client.getPage("http://localhost:%d/favicon.ico" % port)
icon = dr(d)
@@ -190,7 +193,7 @@
d = client.getPage("http://localhost:%d/changes" % port)
changes = dr(d)
- self.failUnless("<li>Syncmail mailing list in maildir my-maildir</li>"
- in changes)
+ self.failUnlessIn("<li>Syncmail mailing list in maildir " +
+ "my-maildir</li>", changes)
dr(m.stopService())
More information about the Commits
mailing list