← 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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-03-08 17:40:26 UTC
  • mfrom: (5684.1.4 blackbox-upgrade-formats)
  • Revision ID: pqm@pqm.ubuntu.com-20110308174026-cy26cy90bbt74squ
(jelmer) Avoid using weave formats in the blackbox upgrade tests. (Jelmer
 Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_upgrade.py
21
21
from bzrlib import (
22
22
    bzrdir,
23
23
    controldir,
 
24
    lockable_files,
 
25
    ui,
24
26
    )
25
27
from bzrlib.tests import (
26
28
    features,
27
29
    TestCaseWithTransport,
28
30
    )
29
31
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
30
 
from bzrlib.repofmt.knitrepo import (
31
 
    RepositoryFormatKnit1,
32
 
    )
 
32
from bzrlib.repofmt.pack_repo import RepositoryFormatKnitPack1
 
33
 
 
34
 
 
35
class OldBzrDir(bzrdir.BzrDirMeta1):
 
36
    """An test bzr dir implementation"""
 
37
 
 
38
    def needs_format_conversion(self, format):
 
39
        return not isinstance(format, self.__class__)
 
40
 
 
41
 
 
42
class ConvertOldTestToMeta(controldir.Converter):
 
43
    """A trivial converter, used for testing."""
 
44
 
 
45
    def convert(self, to_convert, pb):
 
46
        ui.ui_factory.note('starting upgrade from old test format to 2a')
 
47
        to_convert.control_transport.put_bytes(
 
48
            'branch-format',
 
49
            bzrdir.BzrDirMetaFormat1().get_format_string(),
 
50
            mode=to_convert._get_file_mode())
 
51
        return bzrdir.BzrDir.open(to_convert.user_url)
 
52
 
 
53
 
 
54
class OldBzrDirFormat(bzrdir.BzrDirMetaFormat1):
 
55
 
 
56
    _lock_class = lockable_files.TransportLock
 
57
 
 
58
    def get_converter(self, format=None):
 
59
        return ConvertOldTestToMeta()
 
60
 
 
61
    def get_format_string(self):
 
62
        return "Ancient Test Format"
 
63
 
 
64
    def _open(self, transport):
 
65
        return OldBzrDir(transport, self)
33
66
 
34
67
 
35
68
class TestWithUpgradableBranches(TestCaseWithTransport):
36
69
 
37
70
    def setUp(self):
38
71
        super(TestWithUpgradableBranches, self).setUp()
39
 
        self.addCleanup(controldir.ControlDirFormat._set_default_format,
40
 
                        controldir.ControlDirFormat.get_default_format())
41
72
 
42
73
    def make_current_format_branch_and_checkout(self):
43
74
        current_tree = self.make_branch_and_tree('current_format_branch',
45
76
        current_tree.branch.create_checkout(
46
77
            self.get_url('current_format_checkout'), lightweight=True)
47
78
 
48
 
    def make_format_5_branch(self):
49
 
        # setup a format 5 branch we can upgrade from.
50
 
        path = 'format_5_branch'
51
 
        self.make_branch_and_tree(path, format=bzrdir.BzrDirFormat5())
52
 
        return path
53
 
 
54
 
    def make_metadir_weave_branch(self):
55
 
        self.make_branch_and_tree('metadir_weave_branch', format='metaweave')
56
 
 
57
79
    def test_readonly_url_error(self):
58
 
        path = self.make_format_5_branch()
 
80
        self.make_branch_and_tree("old_format_branch", format="knit")
59
81
        (out, err) = self.run_bzr(
60
 
            ['upgrade', self.get_readonly_url(path)], retcode=3)
 
82
            ['upgrade', self.get_readonly_url("old_format_branch")], retcode=3)
61
83
        err_msg = 'Upgrade URL cannot work with readonly URLs.'
62
84
        self.assertEqualDiff('conversion error: %s\nbzr: ERROR: %s\n'
63
85
                             % (err_msg, err_msg),
105
127
        # upgrading a branch in a repo should warn about not upgrading the repo
106
128
        pass
107
129
 
108
 
    def test_upgrade_explicit_metaformat(self):
109
 
        # users can force an upgrade to metadir format.
110
 
        path = self.make_format_5_branch()
 
130
    def test_upgrade_control_dir(self):
 
131
        old_format = OldBzrDirFormat()
 
132
        self.addCleanup(bzrdir.BzrDirFormat.unregister_format, old_format)
 
133
        bzrdir.BzrDirFormat.register_format(old_format)
 
134
        self.addCleanup(controldir.ControlDirFormat._set_default_format,
 
135
                        controldir.ControlDirFormat.get_default_format())
 
136
 
 
137
        # setup an old format branch we can upgrade from.
 
138
        path = 'old_format_branch'
 
139
        self.make_branch_and_tree(path, format=old_format)
111
140
        url = self.get_transport(path).base
112
141
        # check --format takes effect
113
 
        controldir.ControlDirFormat._set_default_format(bzrdir.BzrDirFormat5())
 
142
        controldir.ControlDirFormat._set_default_format(old_format)
114
143
        backup_dir = 'backup.bzr.~1~'
115
144
        (out, err) = self.run_bzr(
116
 
            ['upgrade', '--format=metaweave', url])
 
145
            ['upgrade', '--format=2a', url])
117
146
        self.assertEqualDiff("""Upgrading branch %s ...
118
147
starting upgrade of %s
119
148
making backup of %s.bzr
120
149
  to %s%s
121
 
starting upgrade from format 5 to 6
122
 
adding prefixes to weaves
123
 
adding prefixes to revision-store
124
 
starting upgrade from format 6 to metadir
 
150
starting upgrade from old test format to 2a
125
151
finished
126
152
""" % (url, url, url, url, backup_dir), out)
127
153
        self.assertEqualDiff("", err)
130
156
            bzrdir.BzrDirMetaFormat1))
131
157
 
132
158
    def test_upgrade_explicit_knit(self):
133
 
        # users can force an upgrade to knit format from a metadir weave
134
 
        # branch
135
 
        self.make_metadir_weave_branch()
136
 
        url = self.get_transport('metadir_weave_branch').base
 
159
        # users can force an upgrade to knit format from a metadir pack 0.92
 
160
        # branch to a 2a branch.
 
161
        self.make_branch_and_tree('branch', format='knit')
 
162
        url = self.get_transport('branch').base
137
163
        # check --format takes effect
138
 
        controldir.ControlDirFormat._set_default_format(bzrdir.BzrDirFormat5())
139
164
        backup_dir = 'backup.bzr.~1~'
140
165
        (out, err) = self.run_bzr(
141
 
            ['upgrade', '--format=knit', url])
 
166
            ['upgrade', '--format=pack-0.92', url])
142
167
        self.assertEqualDiff("""Upgrading branch %s ...
143
168
starting upgrade of %s
144
169
making backup of %s.bzr
149
174
""" % (url, url, url, url, backup_dir),
150
175
                             out)
151
176
        self.assertEqualDiff("", err)
152
 
        converted_dir = bzrdir.BzrDir.open(self.get_url('metadir_weave_branch'))
 
177
        converted_dir = bzrdir.BzrDir.open(self.get_url('branch'))
153
178
        self.assertTrue(isinstance(converted_dir._format,
154
179
                                   bzrdir.BzrDirMetaFormat1))
155
180
        self.assertTrue(isinstance(converted_dir.open_repository()._format,
156
 
                                   RepositoryFormatKnit1))
 
181
                                   RepositoryFormatKnitPack1))
157
182
 
158
183
    def test_upgrade_repo(self):
159
 
        self.run_bzr('init-repository --format=metaweave repo')
160
 
        self.run_bzr('upgrade --format=knit repo')
 
184
        self.run_bzr('init-repository --format=pack-0.92 repo')
 
185
        self.run_bzr('upgrade --format=2a repo')
161
186
 
162
187
    def assertLegalOption(self, option_str):
163
188
        # Confirm that an option is legal. (Lower level tests are
194
219
        self.assertTrue(new_perms == old_perms)
195
220
 
196
221
    def test_upgrade_with_existing_backup_dir(self):
197
 
        path = self.make_format_5_branch()
198
 
        t = self.get_transport(path)
 
222
        self.make_branch_and_tree("old_format_branch", format="knit")
 
223
        t = self.get_transport("old_format_branch")
199
224
        url = t.base
200
 
        controldir.ControlDirFormat._set_default_format(bzrdir.BzrDirFormat5())
201
225
        backup_dir1 = 'backup.bzr.~1~'
202
226
        backup_dir2 = 'backup.bzr.~2~'
203
227
        # explicitly create backup_dir1. bzr should create the .~2~ directory
204
228
        # as backup
205
229
        t.mkdir(backup_dir1)
206
230
        (out, err) = self.run_bzr(
207
 
            ['upgrade', '--format=metaweave', url])
 
231
            ['upgrade', '--format=2a', url])
208
232
        self.assertEqualDiff("""Upgrading branch %s ...
209
233
starting upgrade of %s
210
234
making backup of %s.bzr
211
235
  to %s%s
212
 
starting upgrade from format 5 to 6
213
 
adding prefixes to weaves
214
 
adding prefixes to revision-store
215
 
starting upgrade from format 6 to metadir
 
236
starting repository conversion
 
237
repository converted
216
238
finished
217
239
""" % (url, url, url, url, backup_dir2), out)
218
240
        self.assertEqualDiff("", err)
219
241
        self.assertTrue(isinstance(
220
 
            bzrdir.BzrDir.open(self.get_url(path))._format,
 
242
            bzrdir.BzrDir.open(self.get_url("old_format_branch"))._format,
221
243
            bzrdir.BzrDirMetaFormat1))
222
244
        self.assertTrue(t.has(backup_dir2))
223
245
 
226
248
    """Tests for upgrade over sftp."""
227
249
 
228
250
    def test_upgrade_url(self):
229
 
        self.run_bzr('init --format=weave')
 
251
        self.run_bzr('init --format=pack-0.92')
230
252
        t = self.get_transport()
231
253
        url = t.base
232
 
        out, err = self.run_bzr(['upgrade', '--format=knit', url])
 
254
        out, err = self.run_bzr(['upgrade', '--format=2a', url])
233
255
        backup_dir = 'backup.bzr.~1~'
234
256
        self.assertEqualDiff("""Upgrading branch %s ...
235
257
starting upgrade of %s
236
258
making backup of %s.bzr
237
259
  to %s%s
238
 
starting upgrade from format 6 to metadir
239
260
starting repository conversion
240
261
repository converted
241
262
finished