Rev 5411: Make make_branch_builder available to all per_workingtree tests. in file:///home/vila/src/bzr/bugs/323111-orphans/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/323111-orphans/

------------------------------------------------------------
revno: 5411
revision-id: v.ladeuil+lp at free.fr-20100906143602-chi2b11wd77ave21
parent: v.ladeuil+lp at free.fr-20100906100836-ufi18ftz3zx901o7
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: cleanup
timestamp: Mon 2010-09-06 16:36:02 +0200
message:
  Make make_branch_builder available to all per_workingtree tests.
-------------- next part --------------
=== modified file 'bzrlib/tests/per_workingtree/__init__.py'
--- a/bzrlib/tests/per_workingtree/__init__.py	2010-08-21 16:06:24 +0000
+++ b/bzrlib/tests/per_workingtree/__init__.py	2010-09-06 14:36:02 +0000
@@ -23,6 +23,7 @@
 """
 
 from bzrlib import (
+    branchbuilder,
     errors,
     tests,
     workingtree,
@@ -58,6 +59,13 @@
         made_control.create_branch()
         return self.workingtree_format.initialize(made_control)
 
+    def make_branch_builder(self, relpath, format=None):
+        if format is None:
+            format = self.bzrdir_format
+        builder = branchbuilder.BranchBuilder(self.get_transport(),
+                                              format=format)
+        return builder
+
 
 def workingtree_formats():
     """The known working tree formats."""

=== modified file 'bzrlib/tests/per_workingtree/test_merge_from_branch.py'
--- a/bzrlib/tests/per_workingtree/test_merge_from_branch.py	2010-04-01 14:06:48 +0000
+++ b/bzrlib/tests/per_workingtree/test_merge_from_branch.py	2010-09-06 14:36:02 +0000
@@ -20,7 +20,6 @@
 import os
 
 from bzrlib import (
-    branchbuilder,
     errors,
     merge
     )
@@ -119,13 +118,6 @@
 
 class TestMergedBranch(per_workingtree.TestCaseWithWorkingTree):
 
-    def make_branch_builder(self, relpath, format=None):
-        if format is None:
-            format = self.bzrdir_format
-        builder = branchbuilder.BranchBuilder(self.get_transport(),
-                                              format=format)
-        return builder
-
     def make_inner_branch(self):
         bld_inner = self.make_branch_builder('inner')
         bld_inner.start_series()