← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_reconfigure.py

  • Committer: Vincent Ladeuil
  • Date: 2012-03-08 18:30:33 UTC
  • mfrom: (6487 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6488.
  • Revision ID: v.ladeuil+lp@free.fr-20120308183033-bccqnbr1tpozs711
Merge bzr.dev resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconfigure.py
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
from bzrlib import (
18
 
    bzrdir,
 
18
    controldir,
19
19
    errors,
20
20
    tests,
21
21
    workingtree,
22
22
    )
23
 
from bzrlib.branchbuilder import BranchBuilder
24
23
from bzrlib.tests.script import TestCaseWithTransportAndScript
25
24
 
26
25
 
86
85
 
87
86
    def test_use_shared_to_standalone(self):
88
87
        repo = self.make_repository('repo', shared=True)
89
 
        branch = bzrdir.BzrDir.create_branch_convenience('repo/tree')
 
88
        branch = controldir.ControlDir.create_branch_convenience('repo/tree')
90
89
        self.assertNotEqual(branch.bzrdir.root_transport.base,
91
90
            branch.repository.bzrdir.root_transport.base)
92
91
        self.run_bzr('reconfigure --standalone', working_dir='repo/tree')
126
125
 
127
126
    def test_make_without_trees_leaves_tree_alone(self):
128
127
        repo = self.make_repository('repo', shared=True)
129
 
        branch = bzrdir.BzrDir.create_branch_convenience('repo/branch')
 
128
        branch = controldir.ControlDir.create_branch_convenience('repo/branch')
130
129
        tree = workingtree.WorkingTree.open('repo/branch')
131
130
        self.build_tree(['repo/branch/foo'])
132
131
        tree.add('foo')
137
136
 
138
137
    def test_shared_format_to_standalone(self, format=None):
139
138
        repo = self.make_repository('repo', shared=True, format=format)
140
 
        branch = bzrdir.BzrDir.create_branch_convenience('repo/tree')
 
139
        branch = controldir.ControlDir.create_branch_convenience('repo/tree')
141
140
        self.assertNotEqual(branch.bzrdir.root_transport.base,
142
141
            branch.repository.bzrdir.root_transport.base)
143
142
        tree = workingtree.WorkingTree.open('repo/tree')