Rev 5517: (vila) TestCaseWithWorkingTree.make_branch_builder respects its 'relpath' in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5517 [merge]
revision-id: pqm at pqm.ubuntu.com-20101026154436-e7lv5qz41x1jh7gl
parent: pqm at pqm.ubuntu.com-20101026084344-fip1ktaqjin2w720
parent: v.ladeuil+lp at free.fr-20101026135331-ywep4www8ay2k6wp
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2010-10-26 16:44:36 +0100
message:
  (vila) TestCaseWithWorkingTree.make_branch_builder respects its 'relpath'
   parameter (Vincent Ladeuil)
modified:
  bzrlib/tests/per_workingtree/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
  bzrlib/tests/per_workingtree/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
  doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
=== modified file 'bzrlib/tests/per_workingtree/__init__.py'
--- a/bzrlib/tests/per_workingtree/__init__.py	2010-09-06 14:36:02 +0000
+++ b/bzrlib/tests/per_workingtree/__init__.py	2010-10-26 13:53:31 +0000
@@ -62,7 +62,7 @@
     def make_branch_builder(self, relpath, format=None):
         if format is None:
             format = self.bzrdir_format
-        builder = branchbuilder.BranchBuilder(self.get_transport(),
+        builder = branchbuilder.BranchBuilder(self.get_transport(relpath),
                                               format=format)
         return builder
 

=== modified file 'bzrlib/tests/per_workingtree/test_workingtree.py'
--- a/bzrlib/tests/per_workingtree/test_workingtree.py	2010-05-20 18:23:17 +0000
+++ b/bzrlib/tests/per_workingtree/test_workingtree.py	2010-10-26 13:53:31 +0000
@@ -45,6 +45,11 @@
 
 class TestWorkingTree(TestCaseWithWorkingTree):
 
+    def test_branch_builder(self):
+        # Just a smoke test that we get a branch at the specified relpath
+        builder = self.make_branch_builder('foobar')
+        br = branch.Branch.open('foobar')
+
     def test_list_files(self):
         tree = self.make_branch_and_tree('.')
         self.build_tree(['dir/', 'file'])

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- a/doc/en/release-notes/bzr-2.3.txt	2010-10-23 08:27:11 +0000
+++ b/doc/en/release-notes/bzr-2.3.txt	2010-10-26 13:53:31 +0000
@@ -109,6 +109,8 @@
   get rid of some 'bytes left on the HTTP socket' useless log messages.
   (Vincent Ladeuil, #655557)
 
+* ``bzrlib.tests.per_workingtree.TestCaseWithWorkingTree.make_branch_builder``
+  respects its ``relpath`` parameter. (Vincent Ladeuil)
 
 bzr 2.3b2
 #########