Rev 4726: Some refactoring. in file:///home/vila/src/bzr/bugs/438158-dpush-strict/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/438158-dpush-strict/

------------------------------------------------------------
revno: 4726
revision-id: v.ladeuil+lp at free.fr-20091002110613-mwz30ddz8v92uiht
parent: v.ladeuil+lp at free.fr-20091002092700-ujvlvdht1lz52rql
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 438158-dpush-strict
timestamp: Fri 2009-10-02 13:06:13 +0200
message:
  Some refactoring.
  
  * bzrlib/tests/test_foreign.py:
  (register_dummy_foreign_for_test): Factored out now that we have 3
  uses.
  (DummyForeignVcsTests): Use register_dummy_foreign_for_test.
  
  * bzrlib/tests/blackbox/test_dpush.py:
  (TestDpush, TestDpushStrictMixin): Use register_dummy_foreign_for_test.
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_dpush.py'
--- a/bzrlib/tests/blackbox/test_dpush.py	2009-10-02 09:11:43 +0000
+++ b/bzrlib/tests/blackbox/test_dpush.py	2009-10-02 11:06:13 +0000
@@ -60,21 +60,8 @@
 class TestDpush(blackbox.ExternalBase):
 
     def setUp(self):
-        bzrdir.BzrDirFormat.register_control_format(
-            test_foreign.DummyForeignVcsDirFormat)
-        branch.InterBranch.register_optimiser(
-            test_foreign.InterToDummyVcsBranch)
-        self.addCleanup(self.unregister_format)
         super(TestDpush, self).setUp()
-
-    def unregister_format(self):
-        try:
-            bzrdir.BzrDirFormat.unregister_control_format(
-                test_foreign.DummyForeignVcsDirFormat)
-        except ValueError:
-            pass
-        branch.InterBranch.unregister_optimiser(
-            test_foreign.InterToDummyVcsBranch)
+        test_foreign.register_dummy_foreign_for_test(self)
 
     def make_dummy_builder(self, relpath):
         builder = self.make_branch_builder(
@@ -152,24 +139,6 @@
 
 class TestDpushStrictMixin(object):
 
-    # FIXME: setUp and unregister_format needs to be dedupe from TestDpush
-    # (made into functions in test_foreign ?).
-    def setUp(self):
-        bzrdir.BzrDirFormat.register_control_format(
-            test_foreign.DummyForeignVcsDirFormat)
-        branch.InterBranch.register_optimiser(
-            test_foreign.InterToDummyVcsBranch)
-        self.addCleanup(self.unregister_format)
-
-    def unregister_format(self):
-        try:
-            bzrdir.BzrDirFormat.unregister_control_format(
-                test_foreign.DummyForeignVcsDirFormat)
-        except ValueError:
-            pass
-        branch.InterBranch.unregister_optimiser(
-            test_foreign.InterToDummyVcsBranch)
-
     def make_local_branch_and_tree(self):
         self.tree = self.make_branch_and_tree('local')
         self.build_tree_contents([('local/file', 'initial')])
@@ -218,7 +187,7 @@
 
     def setUp(self):
         super(TestDpushStrictWithoutChanges, self).setUp()
-        TestDpushStrictMixin.setUp(self)
+        test_foreign.register_dummy_foreign_for_test(self)
         self.make_local_branch_and_tree()
         self.make_foreign_branch()
 
@@ -247,7 +216,7 @@
 
     def setUp(self):
         super(TestDpushStrictWithChanges, self).setUp()
-        TestDpushStrictMixin.setUp(self)
+        test_foreign.register_dummy_foreign_for_test(self)
         # Apply the changes defined in load_tests: one of _uncommitted_changes,
         # _pending_merges or _out_of_sync_trees
         getattr(self, self._changes_type)()

=== modified file 'bzrlib/tests/test_foreign.py'
--- a/bzrlib/tests/test_foreign.py	2009-10-02 09:27:00 +0000
+++ b/bzrlib/tests/test_foreign.py	2009-10-02 11:06:13 +0000
@@ -255,6 +255,17 @@
                 hardlink=hardlink, stacked=stacked, source_branch=source_branch)
 
 
+def register_dummy_foreign_for_test(testcase):
+    bzrdir.BzrDirFormat.register_control_format(DummyForeignVcsDirFormat)
+    testcase.addCleanup(bzrdir.BzrDirFormat.unregister_control_format,
+                        DummyForeignVcsDirFormat)
+    # We need to register the optimiser to make the dummy appears really
+    # different from a regular bzr repository.
+    branch.InterBranch.register_optimiser(InterToDummyVcsBranch)
+    testcase.addCleanup(branch.InterBranch.unregister_optimiser,
+                        InterToDummyVcsBranch)
+
+
 class ForeignVcsRegistryTests(tests.TestCase):
     """Tests for the ForeignVcsRegistry class."""
 
@@ -316,18 +327,8 @@
     """Very basic test for DummyForeignVcs."""
 
     def setUp(self):
-        bzrdir.BzrDirFormat.register_control_format(DummyForeignVcsDirFormat)
-        branch.InterBranch.register_optimiser(InterToDummyVcsBranch)
-        self.addCleanup(self.unregister)
         super(DummyForeignVcsTests, self).setUp()
-
-    def unregister(self):
-        try:
-            bzrdir.BzrDirFormat.unregister_control_format(
-                DummyForeignVcsDirFormat)
-        except ValueError:
-            pass
-        branch.InterBranch.unregister_optimiser(InterToDummyVcsBranch)
+        register_dummy_foreign_for_test(self)
 
     def test_create(self):
         """Test we can create dummies."""