← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2012-04-16 11:08:11 UTC
  • mfrom: (6521 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120416110811-0y996ihqy9o2bb1t
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
363
363
 
364
364
    def assertRevisionInRepository(self, repo_path, revid):
365
365
        """Check that a revision is in a repo, disregarding stacking."""
366
 
        repo = bzrdir.BzrDir.open(repo_path).open_repository()
 
366
        repo = controldir.ControlDir.open(repo_path).open_repository()
367
367
        self.assertTrue(repo.has_revision(revid))
368
368
 
369
369
    def assertRevisionNotInRepository(self, repo_path, revid):
370
370
        """Check that a revision is not in a repo, disregarding stacking."""
371
 
        repo = bzrdir.BzrDir.open(repo_path).open_repository()
 
371
        repo = controldir.ControlDir.open(repo_path).open_repository()
372
372
        self.assertFalse(repo.has_revision(revid))
373
373
 
374
374
    def assertRevisionsInBranchRepository(self, revid_list, branch_path):
400
400
        # capable of supporting stacking, but not actually have a stacked_on
401
401
        # branch configured
402
402
        self.assertRaises(errors.NotStacked,
403
 
            bzrdir.BzrDir.open('newbranch').open_branch().get_stacked_on_url)
 
403
            controldir.ControlDir.open('newbranch').open_branch().get_stacked_on_url)
404
404
 
405
405
    def test_branch_stacked_branch_stacked(self):
406
406
        """Asking to stack on a stacked branch does work"""