← 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 2.0 branch rev 4647

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_upgrade.py
42
42
        self.old_format = bzrdir.BzrDirFormat.get_default_format()
43
43
        self.old_ui_factory = ui.ui_factory
44
44
        self.addCleanup(self.restoreDefaults)
45
 
 
46
45
        ui.ui_factory = TestUIFactory()
 
46
 
 
47
    def restoreDefaults(self):
 
48
        ui.ui_factory = self.old_ui_factory
 
49
        bzrdir.BzrDirFormat._set_default_format(self.old_format)
 
50
 
 
51
    def make_current_format_branch_and_checkout(self):
 
52
        current_tree = self.make_branch_and_tree('current_format_branch',
 
53
                                                 format='default')
 
54
        current_tree.branch.create_checkout(
 
55
            self.get_url('current_format_checkout'), lightweight=True)
 
56
 
 
57
    def make_format_5_branch(self):
47
58
        # setup a format 5 branch we can upgrade from.
48
59
        self.make_branch_and_tree('format_5_branch',
49
60
                                  format=bzrdir.BzrDirFormat5())
50
61
 
51
 
        current_tree = self.make_branch_and_tree('current_format_branch',
52
 
                                                 format='default')
 
62
    def make_metadir_weave_branch(self):
53
63
        self.make_branch_and_tree('metadir_weave_branch', format='metaweave')
54
 
        current_tree.branch.create_checkout(
55
 
            self.get_url('current_format_checkout'), lightweight=True)
56
 
 
57
 
    def restoreDefaults(self):
58
 
        ui.ui_factory = self.old_ui_factory
59
 
        bzrdir.BzrDirFormat._set_default_format(self.old_format)
60
64
 
61
65
    def test_readonly_url_error(self):
 
66
        self.make_format_5_branch()
62
67
        (out, err) = self.run_bzr(
63
68
            ['upgrade', self.get_readonly_url('format_5_branch')], retcode=3)
64
69
        self.assertEqual(out, "")
65
70
        self.assertEqual(err, "bzr: ERROR: Upgrade URL cannot work with readonly URLs.\n")
66
71
 
67
72
    def test_upgrade_up_to_date(self):
 
73
        self.make_current_format_branch_and_checkout()
68
74
        # when up to date we should get a message to that effect
69
75
        (out, err) = self.run_bzr('upgrade current_format_branch', retcode=3)
70
76
        self.assertEqual("", out)
73
79
                             "recent format.\n", err)
74
80
 
75
81
    def test_upgrade_up_to_date_checkout_warns_branch_left_alone(self):
 
82
        self.make_current_format_branch_and_checkout()
76
83
        # when upgrading a checkout, the branch location and a suggestion
77
84
        # to upgrade it should be emitted even if the checkout is up to
78
85
        # date
100
107
 
101
108
    def test_upgrade_explicit_metaformat(self):
102
109
        # users can force an upgrade to metadir format.
 
110
        self.make_format_5_branch()
103
111
        url = get_transport(self.get_url('format_5_branch')).base
104
112
        # check --format takes effect
105
113
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
122
130
    def test_upgrade_explicit_knit(self):
123
131
        # users can force an upgrade to knit format from a metadir weave
124
132
        # branch
 
133
        self.make_metadir_weave_branch()
125
134
        url = get_transport(self.get_url('metadir_weave_branch')).base
126
135
        # check --format takes effect
127
136
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
175
184
        self.assertEqual('', err)
176
185
 
177
186
 
178
 
class UpgradeRecommendedTests(TestCaseInTempDir):
 
187
class UpgradeRecommendedTests(TestCaseWithTransport):
179
188
 
180
189
    def test_recommend_upgrade_wt4(self):
181
190
        # using a deprecated format gives a warning
191
200
        out, err = self.run_bzr('revno a')
192
201
        if err.find('upgrade') > -1:
193
202
            self.fail("message shouldn't suggest upgrade:\n%s" % err)
 
203
 
 
204
    def test_upgrade_shared_repo(self):
 
205
        repo = self.make_repository('repo', format='2a', shared=True)
 
206
        branch = self.make_branch_and_tree('repo/branch', format="pack-0.92")
 
207
        self.get_transport('repo/branch/.bzr/repository').delete_tree('.')
 
208
        out, err = self.run_bzr(['upgrade'], working_dir='repo/branch')