Rev 3202: Fix two more leaked tmp dirs. in file:///v/home/vila/src/bzr/bugs/123363-tmp-pollution/

[Vincent Ladeuil]

At file:///v/home/vila/src/bzr/bugs/123363-tmp-pollution/

------------------------------------------------------------
revno: 3202
revision-id:v.ladeuil+lp at free.fr-20080129115331-n7nl3ljtkepljzwi
parent: v.ladeuil+lp at free.fr-20080129084053-sunwf549ox6zczqr
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 123363-tmp-pollution
timestamp: Tue 2008-01-29 12:53:31 +0100
message:
  Fix two more leaked tmp dirs.
  
  * bzrlib/tests/blackbox/test_outside_wt.py:
  (TestOutsideWT.test_cwd_log,
  TestOutsideWT.test_diff_outside_tree): Clean up tmp dir.
modified:
  bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_outside_wt.py'
--- a/bzrlib/tests/blackbox/test_outside_wt.py	2007-12-12 07:05:52 +0000
+++ b/bzrlib/tests/blackbox/test_outside_wt.py	2008-01-29 11:53:31 +0000
@@ -21,18 +21,23 @@
 import os
 import tempfile
 
-from bzrlib.tests import ChrootedTestCase
-from bzrlib.osutils import getcwd
-import bzrlib.urlutils as urlutils
-
-
-class TestOutsideWT(ChrootedTestCase):
+from bzrlib import (
+    osutils,
+    tests,
+    urlutils,
+    )
+
+
+class TestOutsideWT(tests.ChrootedTestCase):
     """Test that bzr gives proper errors outside of a working tree."""
 
     def test_cwd_log(self):
-        os.chdir(tempfile.mkdtemp())
+        tmp_dir = tempfile.mkdtemp()
+        self.addCleanup(lambda: osutils.rmtree(tmp_dir))
+        os.chdir(tmp_dir)
         out, err = self.run_bzr('log', retcode=3)
-        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n' % (getcwd(),),
+        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n'
+                         % (osutils.getcwd(),),
                          err)
 
     def test_url_log(self):
@@ -41,14 +46,16 @@
         self.assertEqual(u'bzr: ERROR: Not a branch:'
                          u' "%s".\n' % url, err)
 
-    def test_diff_ouside_tree(self):
-        os.chdir(tempfile.mkdtemp())
+    def test_diff_outside_tree(self):
+        tmp_dir = tempfile.mkdtemp()
+        self.addCleanup(lambda: osutils.rmtree(tmp_dir))
+        os.chdir(tmp_dir)
         self.run_bzr('init branch1')
         self.run_bzr(['commit', '-m', 'nothing',
                                '--unchanged', 'branch1'])
         self.run_bzr(['commit', '-m', 'nothing',
                                '--unchanged', 'branch1'])
-        this_dir = getcwd()
+        this_dir = osutils.getcwd()
         branch2 = "%s/branch2" % (this_dir,)
         # -r X..Y
         out, err = self.run_bzr('diff -r revno:2:branch2..revno:1', retcode=3)