← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_stacking.py

  • Committer: Jelmer Vernooij
  • Date: 2012-04-02 01:44:26 UTC
  • mfrom: (6518 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6519.
  • Revision ID: jelmer@samba.org-20120402014426-0o5qtysohyl006b2
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_stacking.py
18
18
 
19
19
from bzrlib import (
20
20
    branch,
21
 
    bzrdir,
 
21
    controldir,
22
22
    check,
23
23
    errors,
24
24
    )
107
107
 
108
108
    def assertRevisionInRepository(self, repo_path, revid):
109
109
        """Check that a revision is in a repository, disregarding stacking."""
110
 
        repo = bzrdir.BzrDir.open(repo_path).open_repository()
 
110
        repo = controldir.ControlDir.open(repo_path).open_repository()
111
111
        self.assertTrue(repo.has_revision(revid))
112
112
 
113
113
    def assertRevisionNotInRepository(self, repo_path, revid):
114
114
        """Check that a revision is not in a repository, disregarding stacking."""
115
 
        repo = bzrdir.BzrDir.open(repo_path).open_repository()
 
115
        repo = controldir.ControlDir.open(repo_path).open_repository()
116
116
        self.assertFalse(repo.has_revision(revid))
117
117
 
118
118
    def test_get_graph_stacked(self):
165
165
            raise TestNotApplicable(e)
166
166
        # Now serve the original mainline from a smart server
167
167
        remote_transport = self.make_smart_server('mainline')
168
 
        remote_bzrdir = bzrdir.BzrDir.open_from_transport(remote_transport)
 
168
        remote_bzrdir = controldir.ControlDir.open_from_transport(remote_transport)
169
169
        # and make branch from the smart server which is stacked
170
170
        new_dir = remote_bzrdir.sprout('newbranch', stacked=True)
171
171
        # stacked repository