← 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: Gordon Tyler
  • Date: 2011-01-21 23:51:15 UTC
  • mto: This revision was merged to the branch mainline in revision 5632.
  • Revision ID: gordon@doxxx.net-20110121235115-9sdqamejot1h0481
Replace usage of format function from python 2.6 with our own very simple formatting function.

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