Merge lp:~jelmer/trac-bzr/test-fixes into lp:trac-bzr

[Jelmer Vernooij]

Avoid creating additional temporary directories which trigger test isolation errors
in newer versions of Bazaar, e.g.:

BzrError: Attempt to escape test isolation: 'file:///tmp/trac%2Bbzr-8SwFfd/' []

This changes tracbzr's tests to use bzrlib.tests.TestCaseInTempDir instead.

[lp:~jelmer/trac-bzr/test-fixes]

117. By Martin von Gagern on 2011-02-28

Improve unit tests.

=== modified file 'tracbzr/tests/__init__.py'
--- tracbzr/tests/__init__.py	2010-04-12 17:43:11 +0000
+++ tracbzr/tests/__init__.py	2011-02-28 00:21:13 +0000
@@ -1,9 +1,6 @@
+import logging
+
 import os
-import logging
-
-from os import path
-from shutil import rmtree
-from tempfile import mkdtemp
 
 from trac import config
 from bzrlib import bzrdir, tests
@@ -19,31 +16,20 @@
         self.config = config.Configuration(None)
 
 
-class AbstractTracTestCase(tests.TestCase):
-
-    def setUp(self):
-        super(AbstractTracTestCase, self).setUp()
-        self.root = mkdtemp(prefix='trac+bzr-')
-        self.old_cwd = os.getcwd()
-        os.chdir(self.root)
-
-    def trac_repo(self, location):
+class AbstractTracTestCase(tests.TestCaseInTempDir):
+
+    def trac_repo(self, location="repo"):
         param = { 'name': location, 'id': 'trac_bzr_selftest' }
-        return backend.BzrRepository(self.root, param, DummyComponent())
-
-    def tearDown(self):
-        super(MultiBranchTracTestCase, self).tearDown()
-        os.chdir(self.old_cwd)
-        rmtree(self.root)
+        return backend.BzrRepository(os.path.join(self.test_dir, "repo"), param, DummyComponent())
 
 
 class MultiBranchTracTestCase(AbstractTracTestCase):
 
     def setUp(self):
         super(MultiBranchTracTestCase, self).setUp()
-        dir = bzrdir.BzrDir.create(self.root)
+        dir = bzrdir.BzrDir.create(os.path.join(self.test_dir, "repo"))
         self.repo = dir.create_repository()
-        self.treedir = path.join(self.root, 'tree')
+        self.treedir = os.path.join(self.test_dir, "repo", 'tree')
         self.branch = bzrdir.BzrDir.create_branch_convenience(self.treedir,
             force_new_tree=True)
         self.tree = self.branch.bzrdir.open_workingtree()
@@ -53,8 +39,8 @@
 
     def setUp(self):
         super(SingleBranchTracTestCase, self).setUp()
-        branch = bzrdir.BzrDir.create_branch_convenience(self.root, 
-                        force_new_tree=True)
+        branch = bzrdir.BzrDir.create_branch_convenience(
+            os.path.join(self.test_dir, "repo"), force_new_tree=True)
         self.tree = branch.bzrdir.open_workingtree()
         self.repo = branch.repository
-        self.treedir = self.root
+        self.treedir = os.path.join(self.test_dir, "repo")

=== modified file 'tracbzr/tests/test_branch.py'
--- tracbzr/tests/test_branch.py	2009-11-23 14:31:43 +0000
+++ tracbzr/tests/test_branch.py	2011-02-28 00:21:13 +0000
@@ -9,7 +9,6 @@
 
 import urllib
 
-from bzrlib import bzrdir, osutils
 from bzrlib.tests import treeshape
 from trac import versioncontrol
 
@@ -22,6 +21,8 @@
                           self.trac_repo().get_changeset, 'foo')
         self.assertRaises(versioncontrol.NoSuchChangeset, 
                           self.trac_repo().get_changeset, ',foo')
+        self.assertRaises(versioncontrol.NoSuchChangeset, 
+                          self.trac_repo().get_changeset, '1')
         revision_id = self.commit_foo_bar()
         assert revision_id is not None
         changeset = self.trac_repo().get_changeset("1")
@@ -30,9 +31,7 @@
 
     def commit_foo_bar(self):
         """Create a simple revision"""
-        treeshape.build_tree_contents([('a/',), ('a/b', 
+        treeshape.build_tree_contents([('repo/a/',), ('repo/a/b', 
                                         'contents of b')])
         self.tree.add(['a', 'a/b'])
         return self.tree.commit('tree contents', rev_id='foo%bar')
-
-

=== modified file 'tracbzr/tests/test_repository.py'
--- tracbzr/tests/test_repository.py	2009-12-17 09:37:18 +0000
+++ tracbzr/tests/test_repository.py	2011-02-28 00:21:13 +0000
@@ -120,11 +120,11 @@
     def test_rev(self):
         self.commit_foo_bar()
         self.assertEqual(CURRENT_REVISION, self.trac_repo().get_youngest_rev())
-        self.assertEqual('tree,1', self.trac_repo().get_oldest_rev())
+        self.assertEqual(NULL_REVISION, self.trac_repo().get_oldest_rev())
         oldest = self.tree.commit('again')
         repo = self.trac_repo()
         self.assertEqual(CURRENT_REVISION, self.trac_repo().get_youngest_rev())
-        self.assertEqual('tree,1', self.trac_repo().get_oldest_rev())
+        self.assertEqual(NULL_REVISION, self.trac_repo().get_oldest_rev())
 
     def test_previous_rev(self):
         self.commit_foo_bar_baz()