← 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: John Arbash Meinel
  • Date: 2013-06-24 12:03:12 UTC
  • mfrom: (6437.77.2 2.5)
  • mto: This revision was merged to the branch mainline in revision 6579.
  • Revision ID: john@arbash-meinel.com-20130624120312-pmvck24x052csigx
Merge lp:bzr/2.5 r6515 to get the fix for bug #855155 (Dirstate.update_basis_by_delta)

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: