← 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: Ross Lagerwall
  • Date: 2012-08-07 06:32:51 UTC
  • mto: (6437.63.5 2.5)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: rosslagerwall@gmail.com-20120807063251-x9p03ghg2ws8oqjc
Add bzrlib/locale to .bzrignore

bzrlib/locale is generated with ./setup.py build_mo which is in turn called
by ./setup.py build

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
1
 
# Copyright (C) 2006-2012, 2016 Canonical Ltd
 
1
# Copyright (C) 2006-2012 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
71
71
        a = self.example_branch('something/a').branch
72
72
        self.run_bzr('branch something/a')
73
73
        b = branch.Branch.open('a')
74
 
        self.assertEqual(b.last_revision_info(), a.last_revision_info())
 
74
        self.assertEquals(b.last_revision_info(), a.last_revision_info())
75
75
 
76
76
    def test_into_colocated(self):
77
77
        """Branch from a branch into a colocated branch."""
169
169
        t = self.example_branch('source')
170
170
        self.make_bzrdir('target')
171
171
        self.run_bzr("branch source target")
172
 
        self.assertEqual(2, len(t.branch.repository.all_revision_ids()))
 
172
        self.assertEquals(2, len(t.branch.repository.all_revision_ids()))
173
173
 
174
174
    def test_branch_switch_checkout(self):
175
175
        # Checkout in the current directory:
363
363
 
364
364
    def assertRevisionInRepository(self, repo_path, revid):
365
365
        """Check that a revision is in a repo, disregarding stacking."""
366
 
        repo = controldir.ControlDir.open(repo_path).open_repository()
 
366
        repo = bzrdir.BzrDir.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 = controldir.ControlDir.open(repo_path).open_repository()
 
371
        repo = bzrdir.BzrDir.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
 
            controldir.ControlDir.open('newbranch').open_branch().get_stacked_on_url)
 
403
            bzrdir.BzrDir.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"""