[Buildbot-commits] buildbot/buildbot/test test_runner.py,1.2,1.3 test_run.py,1.26,1.27

[Brian Warner]

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

Modified Files:
	test_runner.py test_run.py 
Log Message:
* buildbot/test/test_runner.py (Options.optionsFile): disable on
windows for now, I don't know what ~/.buildbot/ should mean there.

* buildbot/test/test_run.py (BuilderNames.testGetBuilderNames):
win32 compatibility, don't use "/tmp"
(Basedir.testChangeBuilddir): remove more unixisms


Index: test_run.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_run.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- test_run.py	26 Apr 2005 09:43:20 -0000	1.26
+++ test_run.py	26 Apr 2005 18:36:06 -0000	1.27
@@ -4,7 +4,7 @@
 dr = unittest.deferredResult
 from twisted.internet import reactor, defer
 from twisted.python import log
-import sys, os, shutil, time, errno
+import sys, os, os.path, shutil, time, errno
 #log.startLogging(sys.stderr)
 
 from buildbot import master, interfaces
@@ -502,7 +502,8 @@
 class BuilderNames(unittest.TestCase):
 
     def testGetBuilderNames(self):
-        m = master.BuildMaster("/tmp")
+        os.mkdir("bnames")
+        m = master.BuildMaster("bnames")
         s = m.getStatus()
 
         m.loadConfig(config_3)
@@ -794,7 +795,8 @@
         builder = bot.builders.get("dummy")
         self.failUnless(builder)
         self.failUnlessEqual(builder.builddir, "dummy")
-        self.failUnlessEqual(builder.basedir, "slavebase/dummy")
+        self.failUnlessEqual(builder.basedir,
+                             os.path.join("slavebase", "dummy"))
 
         d = m.loadConfig(config_4_newbasedir)
         dr(d)
@@ -805,7 +807,8 @@
         self.failUnless(builder)
         # the basedir should be updated
         self.failUnlessEqual(builder.builddir, "dummy2")
-        self.failUnlessEqual(builder.basedir, "slavebase/dummy2")
+        self.failUnlessEqual(builder.basedir,
+                             os.path.join("slavebase", "dummy2"))
 
         # add a new builder, which causes the basedir list to be reloaded
         d = m.loadConfig(config_4_newbuilder)

Index: test_runner.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_runner.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- test_runner.py	26 Apr 2005 09:43:20 -0000	1.2
+++ test_runner.py	26 Apr 2005 18:36:05 -0000	1.3
@@ -47,4 +47,7 @@
         self.check(["home", "dir1"], "home")
         os.environ['HOME'] = os.path.abspath("reallynothome")
         self.check(["home", "dir1"], None)
-        
+
+if runtime.platformType != 'posix':
+    # I need to figure out what "home directory" might mean on windows
+    del Options