← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_upgrade.py
35
35
    def setUp(self):
36
36
        super(TestWithUpgradableBranches, self).setUp()
37
37
        self.old_format = bzrdir.BzrDirFormat.get_default_format()
38
 
        self.old_repo_format = \
39
 
            bzrlib.repository.RepositoryFormat.get_default_format()
40
38
        self.old_ui_factory = ui.ui_factory
41
39
        self.addCleanup(self.restoreDefaults)
42
40
 
43
41
        ui.ui_factory = TestUIFactory()
44
 
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
45
 
        bzrlib.repository.RepositoryFormat.set_default_format(
46
 
            bzrlib.repository.RepositoryFormat7())
47
 
        # FIXME RBC 20060120 we should be able to do this via ui calls only.
48
42
        # setup a format 5 branch we can upgrade from.
49
 
        t = get_transport(self.get_url())
50
 
        t.mkdir('format_5_branch')
51
 
        bzrdir.BzrDirFormat5().initialize(self.get_url('format_5_branch'))
52
 
        bzrdir.BzrDir.create_standalone_workingtree('current_format_branch')
53
 
        d = bzrdir.BzrDir.create('metadir_weave_branch')
54
 
        d.create_repository()
55
 
        d.create_branch()
56
 
        d.create_workingtree()
57
 
        self.run_bzr('checkout',
58
 
                     '--lightweight',
59
 
                     self.get_url('current_format_branch'),
60
 
                     'current_format_checkout')
 
43
        self.make_branch_and_tree('format_5_branch',
 
44
                                  format=bzrdir.BzrDirFormat5())
 
45
 
 
46
        current_tree = self.make_branch_and_tree('current_format_branch',
 
47
                                                 format='default')
 
48
        self.make_branch_and_tree('metadir_weave_branch', format='metaweave')
 
49
        current_tree.branch.create_checkout(
 
50
            self.get_url('current_format_checkout'), lightweight=True)
61
51
 
62
52
    def restoreDefaults(self):
63
 
        bzrdir.BzrDirFormat.set_default_format(self.old_format)
64
 
        bzrlib.repository.RepositoryFormat.set_default_format(
65
 
            self.old_repo_format)
66
53
        ui.ui_factory = self.old_ui_factory
 
54
        bzrdir.BzrDirFormat._set_default_format(self.old_format)
67
55
 
68
56
    def test_readonly_url_error(self):
69
57
        (out, err) = self.run_bzr_captured(
111
99
        # users can force an upgrade to metadir format.
112
100
        url = get_transport(self.get_url('format_5_branch')).base
113
101
        # check --format takes effect
114
 
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirFormat5())
 
102
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
115
103
        (out, err) = self.run_bzr_captured(
116
104
            ['upgrade', '--format=metaweave', url])
117
105
        self.assertEqualDiff("""starting upgrade of %s
135
123
        # branch
136
124
        url = get_transport(self.get_url('metadir_weave_branch')).base
137
125
        # check --format takes effect
138
 
        bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirFormat5())
 
126
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
139
127
        (out, err) = self.run_bzr_captured(
140
128
            ['upgrade', '--format=knit', url])
141
129
        self.assertEqualDiff("""starting upgrade of %s