Rev 2547: (robertc) Relocate TestCaseWithRepository to be more central. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2547
revision-id: pqm at pqm.ubuntu.com-20070625092303-yr8bqbke8snrmkig
parent: pqm at pqm.ubuntu.com-20070625072710-uiiv39h32diq0al7
parent: robertc at robertcollins.net-20070622050522-bi07tvlincf1h19m
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-25 10:23:03 +0100
message:
  (robertc) Relocate TestCaseWithRepository to be more central.
modified:
  bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
    ------------------------------------------------------------
    revno: 2485.7.2
    merged: robertc at robertcollins.net-20070622050522-bi07tvlincf1h19m
    parent: robertc at robertcollins.net-20070510141122-91gp5mw7mmv88852
    parent: pqm at pqm.ubuntu.com-20070621070542-od3c9uxurv03i41p
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: per-repository-test-setup
    timestamp: Fri 2007-06-22 15:05:22 +1000
    message:
      Merge bzr.dev.
    ------------------------------------------------------------
    revno: 2485.7.1
    merged: robertc at robertcollins.net-20070510141122-91gp5mw7mmv88852
    parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: per-repository-test-setup
    timestamp: Fri 2007-05-11 00:11:22 +1000
    message:
      Relocate TestCaseWithRepository to be more central.
=== modified file 'bzrlib/tests/repository_implementations/__init__.py'
--- a/bzrlib/tests/repository_implementations/__init__.py	2007-03-13 06:55:43 +0000
+++ b/bzrlib/tests/repository_implementations/__init__.py	2007-05-10 14:11:22 +0000
@@ -39,9 +39,23 @@
                           TestLoader,
                           TestSuite,
                           )
+from bzrlib.tests.bzrdir_implementations.test_bzrdir import TestCaseWithBzrDir
 from bzrlib.transport.memory import MemoryServer
 
 
+class TestCaseWithRepository(TestCaseWithBzrDir):
+
+    def make_repository(self, relpath, format=None):
+        if format is None:
+            # Create a repository of the type we are trying to test.
+            made_control = self.make_bzrdir(relpath)
+            return self.repository_format.initialize(made_control)
+        else:
+            return super(TestCaseWithRepository, self).make_repository(
+                relpath, format)
+
+
+
 def test_suite():
     result = TestSuite()
     test_repository_implementations = [

=== modified file 'bzrlib/tests/repository_implementations/test_repository.py'
--- a/bzrlib/tests/repository_implementations/test_repository.py	2007-06-17 17:07:04 +0000
+++ b/bzrlib/tests/repository_implementations/test_repository.py	2007-06-22 05:05:22 +0000
@@ -29,24 +29,12 @@
 from bzrlib.inventory import Inventory, InventoryDirectory
 from bzrlib.revision import NULL_REVISION
 from bzrlib.tests import TestCaseWithTransport, TestSkipped
-from bzrlib.tests.bzrdir_implementations.test_bzrdir import TestCaseWithBzrDir
+from bzrlib.tests.repository_implementations import TestCaseWithRepository
 from bzrlib.transport import get_transport
 from bzrlib.upgrade import upgrade
 from bzrlib.workingtree import WorkingTree
 
 
-class TestCaseWithRepository(TestCaseWithBzrDir):
-
-    def make_repository(self, relpath, format=None):
-        if format is None:
-            # Create a repository of the type we are trying to test.
-            made_control = self.make_bzrdir(relpath)
-            return self.repository_format.initialize(made_control)
-        else:
-            return super(TestCaseWithRepository, self).make_repository(
-                relpath, format)
-
-
 class TestRepositoryMakeBranchAndTree(TestCaseWithRepository):
 
     def test_repository_format(self):