[Buildbot-commits] buildbot/buildbot/test test_vc.py,1.41,1.42

[Brian Warner]

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

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

implement 'try' for CVS (but it doesn't work on non-trunk)

	* buildbot/scripts/tryclient.py (CVSExtractor): implement 'try'
	for CVS trees. It doesn't work for non-trunk branches,
	unfortunately.
	* buildbot/test/test_vc.py (CVS.testTry): test it, but skip the
	branch test

	* Makefile: make it easier to test against python2.2

--This line, and those below, will be ignored--
Files to commit:
   <can't compute list>

This list might be incomplete or outdated if editing the log
message was not invoked from an up-to-date changes buffer!


Index: test_vc.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_vc.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- test_vc.py	15 Aug 2005 20:26:05 -0000	1.41
+++ test_vc.py	16 Aug 2005 00:23:53 -0000	1.42
@@ -768,7 +768,7 @@
         self.failUnlessIn("Hello world.", data)
         self.shouldNotExist(self.workdir, "newbranchfile")
 
-    def do_getpatch(self):
+    def do_getpatch(self, doBranch=True):
         # prepare a buildslave to do checkouts
         vctype = self.vctype
         args = self.vcargs
@@ -794,7 +794,8 @@
         self.trydir = os.path.join(self.repbase, tmpdir)
         d.addCallback(self.do_getpatch_trunkhead)
         d.addCallback(self.do_getpatch_trunkold)
-        d.addCallback(self.do_getpatch_branch)
+        if doBranch:
+            d.addCallback(self.do_getpatch_branch)
         d.addBoth(self.do_getpatch_finish)
         return d
 
@@ -918,6 +919,7 @@
     branchname = "branch"
     try_branchname = "branch"
     vctype = "step.CVS"
+    vctype_try = "cvs"
 
     def capable(self):
         if not VCS.have['cvs']:
@@ -1014,6 +1016,10 @@
     def testBranch(self):
         d = self.do_branch()
         return maybeWait(d)
+        
+    def testTry(self):
+        d = self.do_getpatch(doBranch=False)
+        return maybeWait(d)
 
 
 class SVNSupport(VCBase):