[Buildbot-commits] buildbot/buildbot/test test_vc.py,1.60,1.61

Brian Warner warner at users.sourceforge.net
Mon Jun 12 08:36:46 UTC 2006


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

Modified Files:
	test_vc.py 
Log Message:
[project @ test_vc (P4): skip test properly if p4 is not installed]

Original author: warner at lothar.com
Date: 2006-06-12 08:34:13

Index: test_vc.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_vc.py,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- test_vc.py	12 Jun 2006 08:36:32 -0000	1.60
+++ test_vc.py	12 Jun 2006 08:36:44 -0000	1.61
@@ -408,6 +408,7 @@
     createdRepository = False
     master = None
     slave = None
+    helper = None
     httpServer = None
     httpPort = None
     skip = None
@@ -1503,7 +1504,8 @@
     vc_name = "p4"
 
     def tearDownClass(self):
-        return maybeWait(self.helper.shutdown_p4d())
+        if self.helper:
+            return maybeWait(self.helper.shutdown_p4d())
 
     def testCheckout(self):
         self.helper.vcargs = { 'p4port': self.helper.p4port,





More information about the Commits mailing list