[Buildbot-commits] buildbot/buildbot/test test_vc.py,1.18,1.19

[Brian Warner]

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

Modified Files:
	test_vc.py 
Log Message:
(VC.testArch): unregister the test archive after the test completes, to avoid
cluttering the user's 'tla archives' listing with a bogus entry. Arch doesn't
happen to provide any way to override the use of ~/.arch-params/, so there
isn't a convenient way to avoid touching the setup of the user who runs the
test.
(VC_HTTP.testArchHTTP): same


Index: test_vc.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_vc.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- test_vc.py	28 Oct 2004 07:27:07 -0000	1.18
+++ test_vc.py	24 Nov 2004 22:02:01 -0000	1.19
@@ -348,10 +348,12 @@
         # some better test logic, probably involving a copy of the
         # repository that has a few changes checked in.
 
-        # TODO: run 'tla register-archive -d test at buildbot.sf.net--testvc1'
-        # to get rid of the leftover archive this leaves in the user's 'tla
-        # archives' listing. We can use archive= t set it explicitly, but
-        # if you change it from the default, then 'tla update' won't work.
+        # tell tla to get rid of the leftover archive this test leaves in the
+        # user's 'tla archives' listing. The name of this archive is provided
+        # by the repository tarball, so the following command must use the
+        # same name. We could use archive= to set it explicitly, but if you
+        # change it from the default, then 'tla update' won't work.
+        os.system("tla register-archive -d test at buildbot.sf.net--testvc")
 
 class VC_HTTP(SignalMixin, SetupMixin, unittest.TestCase):
     serveHTTP = RepositoryPath
@@ -371,6 +373,7 @@
             'url': Repository_HTTP % self.httpPort + "/Arch-Repository",
             'version': "testvc--mainline--1",
             }, testRetry=False)
+        os.system("tla register-archive -d test at buildbot.sf.net--testvc")
 
 class Patch(SignalMixin, SetupMixin, unittest.TestCase):