[Buildbot-commits] buildbot/buildbot/test test_vc.py,1.21,1.22

[Brian Warner]

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

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

install buildbot.png, fix test_vc-vs-Twisted-1.3.0

2005-04-19  Brian Warner  <warner at lothar.com>

   * buildbot/test/test_vc.py (SetupMixin.setUpClass): fix the
   skip-if-repositories-are-unavailable test to not kill the trial
   that comes with Twisted-1.3.0

   * setup.py: install buildbot.png icon file when installing code


Index: test_vc.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_vc.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- test_vc.py	12 Apr 2005 00:28:45 -0000	1.21
+++ test_vc.py	19 Apr 2005 08:37:25 -0000	1.22
@@ -167,16 +167,19 @@
     httpPort = None
 
     def setUpClass(self):
+        global VCS
         if VCS is None:
-            global VCS
+            print "doing VCSupport"
             VCS = VCSupport()
         SignalMixin.setUpClass(self)
+
+    def setUp(self):
         if not VCS.RepositoryPath:
+            # this wants to be in setUpClass instead, but the trial in
+            # twisted-1.3.0 can't handle that
             raise unittest.SkipTest("provide "
                                     "BUILDBOT_TEST_VC=path/to/repositories "
                                     "to run this")
-
-    def setUp(self):
         self.serveHTTP()
         shutil.rmtree("basedir", ignore_errors=1)
         os.mkdir("basedir")