/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_controldir/test_push.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_controldir/test_push.py
32
32
 
33
33
    def test_push_new_branch(self):
34
34
        tree = self.create_simple_tree()
35
 
        dir = self.make_repository('dir').bzrdir
 
35
        dir = self.make_repository('dir').controldir
36
36
        result = dir.push_branch(tree.branch)
37
37
        self.assertEqual(tree.branch, result.source_branch)
38
38
        self.assertEqual(dir.open_branch().base, result.target_branch.base)
41
41
 
42
42
    def test_push_new_empty(self):
43
43
        tree = self.make_branch_and_tree('tree')
44
 
        dir = self.make_repository('dir').bzrdir
 
44
        dir = self.make_repository('dir').controldir
45
45
        result = dir.push_branch(tree.branch)
46
46
        self.assertEqual(tree.branch.base, result.source_branch.base)
47
47
        self.assertEqual(dir.open_branch().base,
49
49
 
50
50
    def test_push_incremental(self):
51
51
        tree = self.create_simple_tree()
52
 
        dir = self.make_repository('dir').bzrdir
 
52
        dir = self.make_repository('dir').controldir
53
53
        dir.push_branch(tree.branch)
54
54
        self.build_tree(['tree/b'])
55
55
        tree.add(['b'])