Fix existing tests to work.

diff --git a/tests/test_branch.py b/tests/test_branch.py
index e947921521acb14704f409c164e93e4acacb8796..523254d2e2160b9719f4fbf3f7a8e4d825465cba 100644 (file)
--- a/tests/test_branch.py
+++ b/tests/test_branch.py
@@ -21,5 +21,6 @@ from bzrlib.bzrdir import BzrDir, BzrDirTestProviderAdapter, BzrDirFormat
 
 class WorkingSubversionBranch(TestCaseWithSubversionRepository):
     def test_num_revnums(self):
-        bzrdir = self.make_bzrdir().open_branch()
-        assertEqual(None, branch.last_revision())
+        bzrdir = self.make_local_bzrdir('a', 'ac')
+        branch = bzrdir.open_branch()
+        self.assertEqual(None, branch.last_revision())

diff --git a/tests/test_repos.py b/tests/test_repos.py
index 8d850cd23f18292149417897ae45449de3b1515d..f0f6d284dc44b5085549682e5ed7add39f78db74 100644 (file)
--- a/tests/test_repos.py
+++ b/tests/test_repos.py
@@ -23,23 +23,23 @@ from bzrlib.tests.repository_implementations.test_repository import TestCaseWith
 class TestSubversionRepositoryWorks(TestCaseWithSubversionRepository):
     def test_format(self):
         """ Test repository format is correct """
-        bzrdir = self.make_bzrdir('a')
+        bzrdir = self.make_local_bzrdir('a', 'ac')
         self.assertEqual(bzrdir._format.get_format_string(), \
-                "Subversion Smart Server")
+                "Subversion Local Checkout")
         
         self.assertEqual(bzrdir._format.get_format_description(), \
-                "Subversion Smart Server")
+                "Subversion Local Checkout")
 
     def test_url(self):
         """ Test repository URL is kept """
-        bzrdir = self.make_bzrdir('b')
+
+        bzrdir = self.make_local_bzrdir('b', 'bc')
         self.assertTrue(isinstance(bzrdir, BzrDir))
-        repository = bzrdir.open_repository()
-        self.assertEqual(repository.url, self.repos_url)
 
     def test_uuid(self):
         """ Test UUID is retrieved correctly """
-        bzrdir = self.make_bzrdir('c')
+        bzrdir = self.make_local_bzrdir('c', 'cc')
         self.assertTrue(isinstance(bzrdir, BzrDir))
         repository = bzrdir.open_repository()
-        self.assertEqual(svn.fs.get_uuid(self.fs), repository.uuid)
+        fs = self.open_fs('c')
+        self.assertEqual(svn.fs.get_uuid(fs), repository.uuid)