~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
28
28
        # All branches can define the format they want checkouts made in.
29
29
        # This checks it is honoured.
30
30
        expected_format = a_branch._get_checkout_format(lightweight=True)
31
 
        self.assertEqual(expected_format.get_branch_format().__class__,
32
 
                         tree.branch._format.__class__)
 
31
        self.assertEqual(expected_format.get_branch_format().network_name(),
 
32
                         tree.branch._format.network_name())
33
33
 
34
34
    def test_checkout_format_heavyweight(self):
35
35
        """Make sure the new heavy checkout uses the desired branch format."""
38
38
        # All branches can define the format they want checkouts made in.
39
39
        # This checks it is honoured.
40
40
        expected_format = a_branch._get_checkout_format(lightweight=False)
41
 
        self.assertEqual(expected_format.get_branch_format().__class__,
42
 
                         tree.branch._format.__class__)
 
41
        self.assertEqual(expected_format.get_branch_format().network_name(),
 
42
                         tree.branch._format.network_name())
43
43
 
44
44
    def test_create_revision_checkout(self):
45
45
        """Test that we can create a checkout from an earlier revision."""