← 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: Ian Clatworthy
  • Date: 2009-09-09 15:30:59 UTC
  • mto: (4634.37.2 prepare-2.0)
  • mto: This revision was merged to the branch mainline in revision 4689.
  • Revision ID: ian.clatworthy@canonical.com-20090909153059-sb038agvd38ci2q8
more link fixes in the User Guide

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_upgrade.py
1
 
# Copyright (C) 2006-2011 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Black box tests for the upgrade ui."""
 
18
 
18
19
import os
19
 
import stat
20
20
 
21
21
from bzrlib import (
22
22
    bzrdir,
23
 
    controldir,
24
 
    lockable_files,
 
23
    repository,
25
24
    ui,
26
 
    urlutils,
27
25
    )
28
26
from bzrlib.tests import (
29
 
    features,
 
27
    TestCaseInTempDir,
30
28
    TestCaseWithTransport,
 
29
    TestUIFactory,
31
30
    )
32
31
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
33
 
from bzrlib.repofmt.knitpack_repo import RepositoryFormatKnitPack1
34
 
 
35
 
 
36
 
class OldBzrDir(bzrdir.BzrDirMeta1):
37
 
    """An test bzr dir implementation"""
38
 
 
39
 
    def needs_format_conversion(self, format):
40
 
        return not isinstance(format, self.__class__)
41
 
 
42
 
 
43
 
class ConvertOldTestToMeta(controldir.Converter):
44
 
    """A trivial converter, used for testing."""
45
 
 
46
 
    def convert(self, to_convert, pb):
47
 
        ui.ui_factory.note('starting upgrade from old test format to 2a')
48
 
        to_convert.control_transport.put_bytes(
49
 
            'branch-format',
50
 
            bzrdir.BzrDirMetaFormat1().get_format_string(),
51
 
            mode=to_convert._get_file_mode())
52
 
        return controldir.ControlDir.open(to_convert.user_url)
53
 
 
54
 
 
55
 
class OldBzrDirFormat(bzrdir.BzrDirMetaFormat1):
56
 
 
57
 
    _lock_class = lockable_files.TransportLock
58
 
 
59
 
    def get_converter(self, format=None):
60
 
        return ConvertOldTestToMeta()
61
 
 
62
 
    @classmethod
63
 
    def get_format_string(cls):
64
 
        return "Ancient Test Format"
65
 
 
66
 
    def _open(self, transport):
67
 
        return OldBzrDir(transport, self)
 
32
from bzrlib.transport import get_transport
 
33
from bzrlib.repofmt.knitrepo import (
 
34
    RepositoryFormatKnit1,
 
35
    )
68
36
 
69
37
 
70
38
class TestWithUpgradableBranches(TestCaseWithTransport):
71
39
 
72
40
    def setUp(self):
73
41
        super(TestWithUpgradableBranches, self).setUp()
 
42
        self.old_format = bzrdir.BzrDirFormat.get_default_format()
 
43
        self.old_ui_factory = ui.ui_factory
 
44
        self.addCleanup(self.restoreDefaults)
 
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)
74
50
 
75
51
    def make_current_format_branch_and_checkout(self):
76
52
        current_tree = self.make_branch_and_tree('current_format_branch',
78
54
        current_tree.branch.create_checkout(
79
55
            self.get_url('current_format_checkout'), lightweight=True)
80
56
 
 
57
    def make_format_5_branch(self):
 
58
        # setup a format 5 branch we can upgrade from.
 
59
        self.make_branch_and_tree('format_5_branch',
 
60
                                  format=bzrdir.BzrDirFormat5())
 
61
 
 
62
    def make_metadir_weave_branch(self):
 
63
        self.make_branch_and_tree('metadir_weave_branch', format='metaweave')
 
64
 
81
65
    def test_readonly_url_error(self):
82
 
        self.make_branch_and_tree("old_format_branch", format="knit")
 
66
        self.make_format_5_branch()
83
67
        (out, err) = self.run_bzr(
84
 
            ['upgrade', self.get_readonly_url("old_format_branch")], retcode=3)
85
 
        err_msg = 'Upgrade URL cannot work with readonly URLs.'
86
 
        self.assertEqualDiff('conversion error: %s\nbzr: ERROR: %s\n'
87
 
                             % (err_msg, err_msg),
88
 
                             err)
 
68
            ['upgrade', self.get_readonly_url('format_5_branch')], retcode=3)
 
69
        self.assertEqual(out, "")
 
70
        self.assertEqual(err, "bzr: ERROR: Upgrade URL cannot work with readonly URLs.\n")
89
71
 
90
72
    def test_upgrade_up_to_date(self):
91
73
        self.make_current_format_branch_and_checkout()
92
74
        # when up to date we should get a message to that effect
93
 
        burl = self.get_transport('current_format_branch').local_abspath(".")
94
 
        (out, err) = self.run_bzr('upgrade current_format_branch', retcode=0)
95
 
        self.assertEqual(
96
 
            'Upgrading branch %s/ ...\n'
97
 
            'The branch format %s is already at the most recent format.\n'
98
 
            % (burl, 'Meta directory format 1'),
99
 
            out)
 
75
        (out, err) = self.run_bzr('upgrade current_format_branch', retcode=3)
 
76
        self.assertEqual("", out)
 
77
        self.assertEqualDiff("bzr: ERROR: The branch format Meta "
 
78
                             "directory format 1 is already at the most "
 
79
                             "recent format.\n", err)
100
80
 
101
81
    def test_upgrade_up_to_date_checkout_warns_branch_left_alone(self):
102
82
        self.make_current_format_branch_and_checkout()
103
83
        # when upgrading a checkout, the branch location and a suggestion
104
84
        # to upgrade it should be emitted even if the checkout is up to
105
85
        # date
106
 
        burl = self.get_transport('current_format_branch').local_abspath(".")
107
 
        curl = self.get_transport('current_format_checkout').local_abspath(".")
108
 
        (out, err) = self.run_bzr('upgrade current_format_checkout', retcode=0)
109
 
        self.assertEqual(
110
 
            'Upgrading branch %s/ ...\nThis is a checkout.'
111
 
            ' The branch (%s/) needs to be upgraded separately.\n'
112
 
            'The branch format %s is already at the most recent format.\n'
113
 
            % (curl, burl, 'Meta directory format 1'),
114
 
            out)
 
86
        (out, err) = self.run_bzr('upgrade current_format_checkout', retcode=3)
 
87
        self.assertEqual("This is a checkout. The branch (%s) needs to be "
 
88
                         "upgraded separately.\n"
 
89
                         % get_transport(self.get_url('current_format_branch')).base,
 
90
                         out)
 
91
        self.assertEqualDiff("bzr: ERROR: The branch format Meta "
 
92
                             "directory format 1 is already at the most "
 
93
                             "recent format.\n", err)
115
94
 
116
95
    def test_upgrade_checkout(self):
117
96
        # upgrading a checkout should work
122
101
        # anonymous branch
123
102
        pass
124
103
 
125
 
    def test_upgrade_branch_in_repo(self):
 
104
    def test_ugrade_branch_in_repo(self):
126
105
        # upgrading a branch in a repo should warn about not upgrading the repo
127
106
        pass
128
107
 
129
 
    def test_upgrade_control_dir(self):
130
 
        old_format = OldBzrDirFormat()
131
 
        self.addCleanup(bzrdir.BzrProber.formats.remove,
132
 
            old_format.get_format_string())
133
 
        bzrdir.BzrProber.formats.register(old_format.get_format_string(),
134
 
            old_format)
135
 
        self.addCleanup(controldir.ControlDirFormat._set_default_format,
136
 
                        controldir.ControlDirFormat.get_default_format())
137
 
 
138
 
        # setup an old format branch we can upgrade from.
139
 
        path = 'old_format_branch'
140
 
        self.make_branch_and_tree(path, format=old_format)
141
 
        transport = self.get_transport(path)
142
 
        url = transport.base
143
 
        display_url = transport.local_abspath('.')
 
108
    def test_upgrade_explicit_metaformat(self):
 
109
        # users can force an upgrade to metadir format.
 
110
        self.make_format_5_branch()
 
111
        url = get_transport(self.get_url('format_5_branch')).base
144
112
        # check --format takes effect
145
 
        controldir.ControlDirFormat._set_default_format(old_format)
146
 
        backup_dir = 'backup.bzr.~1~'
 
113
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
147
114
        (out, err) = self.run_bzr(
148
 
            ['upgrade', '--format=2a', url])
149
 
        self.assertEqualDiff("""Upgrading branch %s/ ...
150
 
starting upgrade of %s/
151
 
making backup of %s/.bzr
152
 
  to %s/%s
153
 
starting upgrade from old test format to 2a
 
115
            ['upgrade', '--format=metaweave', url])
 
116
        self.assertEqualDiff("""starting upgrade of %s
 
117
making backup of %s.bzr
 
118
  to %sbackup.bzr
 
119
starting upgrade from format 5 to 6
 
120
adding prefixes to weaves
 
121
adding prefixes to revision-store
 
122
starting upgrade from format 6 to metadir
154
123
finished
155
 
""" % (display_url, display_url, display_url, display_url, backup_dir), out)
 
124
""" % (url, url, url), out)
156
125
        self.assertEqualDiff("", err)
157
126
        self.assertTrue(isinstance(
158
 
            controldir.ControlDir.open(self.get_url(path))._format,
 
127
            bzrdir.BzrDir.open(self.get_url('format_5_branch'))._format,
159
128
            bzrdir.BzrDirMetaFormat1))
160
129
 
161
130
    def test_upgrade_explicit_knit(self):
162
 
        # users can force an upgrade to knit format from a metadir pack 0.92
163
 
        # branch to a 2a branch.
164
 
        self.make_branch_and_tree('branch', format='knit')
165
 
        transport = self.get_transport('branch')
166
 
        url = transport.base
167
 
        display_url = transport.local_abspath('.')
 
131
        # users can force an upgrade to knit format from a metadir weave
 
132
        # branch
 
133
        self.make_metadir_weave_branch()
 
134
        url = get_transport(self.get_url('metadir_weave_branch')).base
168
135
        # check --format takes effect
169
 
        backup_dir = 'backup.bzr.~1~'
 
136
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
170
137
        (out, err) = self.run_bzr(
171
 
            ['upgrade', '--format=pack-0.92', url])
172
 
        self.assertEqualDiff("""Upgrading branch %s/ ...
173
 
starting upgrade of %s/
174
 
making backup of %s/.bzr
175
 
  to %s/%s
 
138
            ['upgrade', '--format=knit', url])
 
139
        self.assertEqualDiff("""starting upgrade of %s
 
140
making backup of %s.bzr
 
141
  to %sbackup.bzr
176
142
starting repository conversion
177
143
repository converted
178
144
finished
179
 
""" % (display_url, display_url, display_url, display_url, backup_dir),
180
 
                             out)
 
145
""" % (url, url, url), out)
181
146
        self.assertEqualDiff("", err)
182
 
        converted_dir = controldir.ControlDir.open(self.get_url('branch'))
 
147
        converted_dir = bzrdir.BzrDir.open(self.get_url('metadir_weave_branch'))
183
148
        self.assertTrue(isinstance(converted_dir._format,
184
149
                                   bzrdir.BzrDirMetaFormat1))
185
150
        self.assertTrue(isinstance(converted_dir.open_repository()._format,
186
 
                                   RepositoryFormatKnitPack1))
 
151
                                   RepositoryFormatKnit1))
187
152
 
188
153
    def test_upgrade_repo(self):
189
 
        self.run_bzr('init-repository --format=pack-0.92 repo')
190
 
        self.run_bzr('upgrade --format=2a repo')
191
 
 
192
 
    def assertLegalOption(self, option_str):
193
 
        # Confirm that an option is legal. (Lower level tests are
194
 
        # expected to validate the actual functionality.)
195
 
        self.run_bzr('init --format=pack-0.92 branch-foo')
196
 
        self.run_bzr('upgrade --format=2a branch-foo %s' % (option_str,))
197
 
 
198
 
    def assertBranchFormat(self, dir, format):
199
 
        branch = controldir.ControlDir.open_tree_or_branch(self.get_url(dir))[1]
200
 
        branch_format = branch._format
201
 
        meta_format = controldir.format_registry.make_bzrdir(format)
202
 
        expected_format = meta_format.get_branch_format()
203
 
        self.assertEqual(expected_format, branch_format)
204
 
 
205
 
    def test_upgrade_clean_supported(self):
206
 
        self.assertLegalOption('--clean')
207
 
        self.assertBranchFormat('branch-foo', '2a')
208
 
        backup_bzr_dir = os.path.join("branch-foo", "backup.bzr.~1~")
209
 
        self.assertFalse(os.path.exists(backup_bzr_dir))
210
 
 
211
 
    def test_upgrade_dry_run_supported(self):
212
 
        self.assertLegalOption('--dry-run')
213
 
        self.assertBranchFormat('branch-foo', 'pack-0.92')
214
 
 
215
 
    def test_upgrade_permission_check(self):
216
 
        """'backup.bzr' should retain permissions of .bzr. Bug #262450"""
217
 
        self.requireFeature(features.posix_permissions_feature)
218
 
        old_perms = stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR
219
 
        backup_dir = 'backup.bzr.~1~'
220
 
        self.run_bzr('init --format=1.6')
221
 
        os.chmod('.bzr', old_perms)
222
 
        self.run_bzr('upgrade')
223
 
        new_perms = os.stat(backup_dir).st_mode & 0777
224
 
        self.assertTrue(new_perms == old_perms)
225
 
 
226
 
    def test_upgrade_with_existing_backup_dir(self):
227
 
        self.make_branch_and_tree("old_format_branch", format="knit")
228
 
        t = self.get_transport("old_format_branch")
229
 
        url = t.base
230
 
        display_url = t.local_abspath('.')
231
 
        backup_dir1 = 'backup.bzr.~1~'
232
 
        backup_dir2 = 'backup.bzr.~2~'
233
 
        # explicitly create backup_dir1. bzr should create the .~2~ directory
234
 
        # as backup
235
 
        t.mkdir(backup_dir1)
236
 
        (out, err) = self.run_bzr(
237
 
            ['upgrade', '--format=2a', url])
238
 
        self.assertEqualDiff("""Upgrading branch %s/ ...
239
 
starting upgrade of %s/
240
 
making backup of %s/.bzr
241
 
  to %s/%s
242
 
starting repository conversion
243
 
repository converted
244
 
finished
245
 
""" % (display_url, display_url, display_url, display_url, backup_dir2), out)
246
 
        self.assertEqualDiff("", err)
247
 
        self.assertTrue(isinstance(
248
 
            controldir.ControlDir.open(self.get_url("old_format_branch"))._format,
249
 
            bzrdir.BzrDirMetaFormat1))
250
 
        self.assertTrue(t.has(backup_dir2))
 
154
        self.run_bzr('init-repository --format=metaweave repo')
 
155
        self.run_bzr('upgrade --format=knit repo')
251
156
 
252
157
 
253
158
class SFTPTests(TestCaseWithSFTPServer):
254
159
    """Tests for upgrade over sftp."""
255
160
 
 
161
    def setUp(self):
 
162
        super(SFTPTests, self).setUp()
 
163
        self.old_ui_factory = ui.ui_factory
 
164
        self.addCleanup(self.restoreDefaults)
 
165
 
 
166
        ui.ui_factory = TestUIFactory()
 
167
 
 
168
    def restoreDefaults(self):
 
169
        ui.ui_factory = self.old_ui_factory
 
170
 
256
171
    def test_upgrade_url(self):
257
 
        self.run_bzr('init --format=pack-0.92')
258
 
        t = self.get_transport()
 
172
        self.run_bzr('init --format=weave')
 
173
        t = get_transport(self.get_url())
259
174
        url = t.base
260
 
        display_url = urlutils.unescape_for_display(url,
261
 
            'utf-8')
262
 
        out, err = self.run_bzr(['upgrade', '--format=2a', url])
263
 
        backup_dir = 'backup.bzr.~1~'
264
 
        self.assertEqualDiff("""Upgrading branch %s ...
265
 
starting upgrade of %s
 
175
        out, err = self.run_bzr(['upgrade', '--format=knit', url])
 
176
        self.assertEqualDiff("""starting upgrade of %s
266
177
making backup of %s.bzr
267
 
  to %s%s
 
178
  to %sbackup.bzr
 
179
starting upgrade from format 6 to metadir
268
180
starting repository conversion
269
181
repository converted
270
182
finished
271
 
""" % (display_url, display_url, display_url, display_url, backup_dir), out)
 
183
""" % (url, url, url), out)
272
184
        self.assertEqual('', err)
273
185
 
274
186