/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_upgrade.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:06:46 UTC
  • mfrom: (6673 work)
  • mto: This revision was merged to the branch mainline in revision 6675.
  • Revision ID: jelmer@jelmer.uk-20170610000646-xj6jh277lo4xuo10
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_upgrade.py
24
24
 
25
25
from .. import (
26
26
    branch,
 
27
    bzrbranch,
27
28
    controldir,
28
29
    tests,
29
30
    upgrade,
49
50
        converter = b.bzrdir._format.get_converter(target)
50
51
        converter.convert(b.bzrdir, None)
51
52
        new_branch = branch.Branch.open(self.get_url('branch'))
52
 
        self.assertIs(new_branch.__class__, branch.BzrBranch6)
 
53
        self.assertIs(new_branch.__class__, bzrbranch.BzrBranch6)
53
54
        self.assertEqual('CD', new_branch.last_revision())
54
55
        self.assertEqual('file:///EF', new_branch.get_parent())
55
56
        self.assertEqual('file:///GH', new_branch.get_bound_location())
60
61
        converter = b2.bzrdir._format.get_converter(target)
61
62
        converter.convert(b2.bzrdir, None)
62
63
        b2 = branch.Branch.open(self.get_url('branch'))
63
 
        self.assertIs(b2.__class__, branch.BzrBranch6)
 
64
        self.assertIs(b2.__class__, bzrbranch.BzrBranch6)
64
65
 
65
66
    def test_convert_branch7_branch8(self):
66
67
        b = self.make_branch('branch', format='1.9')
67
68
        target = controldir.format_registry.make_bzrdir('1.9')
68
 
        target.set_branch_format(branch.BzrBranchFormat8())
 
69
        target.set_branch_format(bzrbranch.BzrBranchFormat8())
69
70
        converter = b.bzrdir._format.get_converter(target)
70
71
        converter.convert(b.bzrdir, None)
71
72
        b = branch.Branch.open(self.get_url('branch'))
72
 
        self.assertIs(b.__class__, branch.BzrBranch8)
 
73
        self.assertIs(b.__class__, bzrbranch.BzrBranch8)
73
74
        self.assertEqual({}, b._get_all_reference_info())
74
75
 
75
76
    def test_convert_knit_dirstate_empty(self):