/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/per_branch/test_http.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:17:06 UTC
  • mto: (6670.4.8 move-bzr)
  • mto: This revision was merged to the branch mainline in revision 6681.
  • Revision ID: jelmer@jelmer.uk-20170610001706-xn6jiuev350246mr
Rename a number of attributes from bzrdir to controldir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_branch/test_http.py
46
46
            ['parent/', 'parent/path/', 'parent/path/to/',
47
47
             'child/', 'child/path/', 'child/path/to/'],
48
48
            transport=self.get_transport())
49
 
        self.make_branch('parent/path/to/a').bzrdir.sprout(self.get_url('child/path/to/b'))
 
49
        self.make_branch('parent/path/to/a').controldir.sprout(self.get_url('child/path/to/b'))
50
50
 
51
51
        # The child branch internally will have recorded that its parent is at
52
52
        # "../../../../parent/path/to/a" or similar.  So we move the child
67
67
        # If clone can't determine the location of the parent of the branch
68
68
        # being cloned, then the new branch will have no parent set.
69
69
        branch_b = self.get_branch_with_invalid_parent()
70
 
        branch_c = branch_b.bzrdir.clone('c').open_branch()
 
70
        branch_c = branch_b.controldir.clone('c').open_branch()
71
71
        self.assertEqual(None, branch_c.get_parent())
72
72
 
73
73
    def test_sprout_invalid_parent(self):
74
74
        # A sprouted branch will have a parent of the branch it was sprouted
75
75
        # from, even if that branch has an invalid parent.
76
76
        branch_b = self.get_branch_with_invalid_parent()
77
 
        branch_c = branch_b.bzrdir.sprout('c').open_branch()
 
77
        branch_c = branch_b.controldir.sprout('c').open_branch()
78
78
        self.assertEqual(branch_b.base, branch_c.get_parent())