/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 tests/test_push.py

Fix compatibility with newer versions of breezy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_push.py
17
17
 
18
18
"""Tests for pushing revisions from Bazaar into Git."""
19
19
 
20
 
from ....bzrdir import (
 
20
from ....controldir import (
21
21
    format_registry,
22
22
    )
23
23
from ....repository import (
42
42
    def setUp(self):
43
43
        super(InterToGitRepositoryTests, self).setUp()
44
44
        self.git_repo = self.make_repository("git",
45
 
                format=format_registry.make_bzrdir("git"))
 
45
                format=format_registry.make_controldir("git"))
46
46
        self.bzr_repo = self.make_repository("bzr", shared=True)
47
47
 
48
48
    def _get_interrepo(self, mapping=None):
87
87
 
88
88
    def test_odd_rename(self):
89
89
        # Add initial revision to bzr branch.
90
 
        branch = self.bzr_repo.bzrdir.create_branch()
91
 
        tree = branch.bzrdir.create_workingtree()
 
90
        branch = self.bzr_repo.controldir.create_branch()
 
91
        tree = branch.controldir.create_workingtree()
92
92
        self.build_tree(["bzr/bar/", "bzr/bar/foobar"])
93
93
        tree.add(["bar", "bar/foobar"])
94
94
        tree.commit("initial")