← 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: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_upgrade.py
1
 
# Copyright (C) 2006, 2007, 2009 Canonical Ltd
 
1
# Copyright (C) 2006-2010 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
 
 
19
18
import os
 
19
import stat
20
20
 
21
21
from bzrlib import (
22
22
    bzrdir,
23
 
    repository,
24
 
    ui,
 
23
    controldir,
 
24
    transport,
25
25
    )
26
26
from bzrlib.tests import (
27
 
    TestCaseInTempDir,
 
27
    features,
28
28
    TestCaseWithTransport,
29
 
    TestUIFactory,
30
29
    )
31
30
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
32
 
from bzrlib.transport import get_transport
33
31
from bzrlib.repofmt.knitrepo import (
34
32
    RepositoryFormatKnit1,
35
33
    )
39
37
 
40
38
    def setUp(self):
41
39
        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
 
 
46
 
        ui.ui_factory = TestUIFactory()
 
40
        self.addCleanup(controldir.ControlDirFormat._set_default_format,
 
41
                        controldir.ControlDirFormat.get_default_format())
 
42
 
 
43
    def make_current_format_branch_and_checkout(self):
 
44
        current_tree = self.make_branch_and_tree('current_format_branch',
 
45
                                                 format='default')
 
46
        current_tree.branch.create_checkout(
 
47
            self.get_url('current_format_checkout'), lightweight=True)
 
48
 
 
49
    def make_format_5_branch(self):
47
50
        # setup a format 5 branch we can upgrade from.
48
51
        self.make_branch_and_tree('format_5_branch',
49
52
                                  format=bzrdir.BzrDirFormat5())
50
53
 
51
 
        current_tree = self.make_branch_and_tree('current_format_branch',
52
 
                                                 format='default')
 
54
    def make_metadir_weave_branch(self):
53
55
        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
56
 
61
57
    def test_readonly_url_error(self):
 
58
        self.make_format_5_branch()
62
59
        (out, err) = self.run_bzr(
63
60
            ['upgrade', self.get_readonly_url('format_5_branch')], retcode=3)
64
61
        self.assertEqual(out, "")
65
62
        self.assertEqual(err, "bzr: ERROR: Upgrade URL cannot work with readonly URLs.\n")
66
63
 
67
64
    def test_upgrade_up_to_date(self):
 
65
        self.make_current_format_branch_and_checkout()
68
66
        # when up to date we should get a message to that effect
69
67
        (out, err) = self.run_bzr('upgrade current_format_branch', retcode=3)
70
68
        self.assertEqual("", out)
73
71
                             "recent format.\n", err)
74
72
 
75
73
    def test_upgrade_up_to_date_checkout_warns_branch_left_alone(self):
 
74
        self.make_current_format_branch_and_checkout()
76
75
        # when upgrading a checkout, the branch location and a suggestion
77
76
        # to upgrade it should be emitted even if the checkout is up to
78
77
        # date
79
78
        (out, err) = self.run_bzr('upgrade current_format_checkout', retcode=3)
80
79
        self.assertEqual("This is a checkout. The branch (%s) needs to be "
81
80
                         "upgraded separately.\n"
82
 
                         % get_transport(self.get_url('current_format_branch')).base,
 
81
                         % transport.get_transport(
 
82
                self.get_url('current_format_branch')).base,
83
83
                         out)
84
84
        self.assertEqualDiff("bzr: ERROR: The branch format Meta "
85
85
                             "directory format 1 is already at the most "
100
100
 
101
101
    def test_upgrade_explicit_metaformat(self):
102
102
        # users can force an upgrade to metadir format.
103
 
        url = get_transport(self.get_url('format_5_branch')).base
 
103
        self.make_format_5_branch()
 
104
        url = transport.get_transport(self.get_url('format_5_branch')).base
104
105
        # check --format takes effect
105
 
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
 
106
        controldir.ControlDirFormat._set_default_format(bzrdir.BzrDirFormat5())
 
107
        backup_dir = 'backup.bzr.~1~'
106
108
        (out, err) = self.run_bzr(
107
109
            ['upgrade', '--format=metaweave', url])
108
110
        self.assertEqualDiff("""starting upgrade of %s
109
111
making backup of %s.bzr
110
 
  to %sbackup.bzr
 
112
  to %s%s
111
113
starting upgrade from format 5 to 6
112
114
adding prefixes to weaves
113
115
adding prefixes to revision-store
114
116
starting upgrade from format 6 to metadir
115
117
finished
116
 
""" % (url, url, url), out)
 
118
""" % (url, url, url, backup_dir), out)
117
119
        self.assertEqualDiff("", err)
118
120
        self.assertTrue(isinstance(
119
121
            bzrdir.BzrDir.open(self.get_url('format_5_branch'))._format,
122
124
    def test_upgrade_explicit_knit(self):
123
125
        # users can force an upgrade to knit format from a metadir weave
124
126
        # branch
125
 
        url = get_transport(self.get_url('metadir_weave_branch')).base
 
127
        self.make_metadir_weave_branch()
 
128
        url = transport.get_transport(self.get_url('metadir_weave_branch')).base
126
129
        # check --format takes effect
127
 
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
 
130
        controldir.ControlDirFormat._set_default_format(bzrdir.BzrDirFormat5())
 
131
        backup_dir = 'backup.bzr.~1~'
128
132
        (out, err) = self.run_bzr(
129
133
            ['upgrade', '--format=knit', url])
130
134
        self.assertEqualDiff("""starting upgrade of %s
131
135
making backup of %s.bzr
132
 
  to %sbackup.bzr
 
136
  to %s%s
133
137
starting repository conversion
134
138
repository converted
135
139
finished
136
 
""" % (url, url, url), out)
 
140
""" % (url, url, url, backup_dir), out)
137
141
        self.assertEqualDiff("", err)
138
142
        converted_dir = bzrdir.BzrDir.open(self.get_url('metadir_weave_branch'))
139
143
        self.assertTrue(isinstance(converted_dir._format,
145
149
        self.run_bzr('init-repository --format=metaweave repo')
146
150
        self.run_bzr('upgrade --format=knit repo')
147
151
 
 
152
    def test_upgrade_permission_check(self):
 
153
        """'backup.bzr' should retain permissions of .bzr. Bug #262450"""
 
154
        self.requireFeature(features.posix_permissions_feature)
 
155
        old_perms = stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR
 
156
        backup_dir = 'backup.bzr.~1~'
 
157
        self.run_bzr('init --format=1.6')
 
158
        os.chmod('.bzr', old_perms)
 
159
        self.run_bzr('upgrade')
 
160
        new_perms = os.stat(backup_dir).st_mode & 0777
 
161
        self.assertTrue(new_perms == old_perms)
 
162
 
 
163
 
 
164
    def test_upgrade_with_existing_backup_dir(self):
 
165
        self.make_format_5_branch()
 
166
        t = transport.get_transport(self.get_url('format_5_branch'))
 
167
        url = t.base
 
168
        controldir.ControlDirFormat._set_default_format(bzrdir.BzrDirFormat5())
 
169
        backup_dir1 = 'backup.bzr.~1~'
 
170
        backup_dir2 = 'backup.bzr.~2~'
 
171
        # explicitly create backup_dir1. bzr should create the .~2~ directory
 
172
        # as backup
 
173
        t.mkdir(backup_dir1)
 
174
        (out, err) = self.run_bzr(
 
175
            ['upgrade', '--format=metaweave', url])
 
176
        self.assertEqualDiff("""starting upgrade of %s
 
177
making backup of %s.bzr
 
178
  to %s%s
 
179
starting upgrade from format 5 to 6
 
180
adding prefixes to weaves
 
181
adding prefixes to revision-store
 
182
starting upgrade from format 6 to metadir
 
183
finished
 
184
""" % (url, url, url, backup_dir2), out)
 
185
        self.assertEqualDiff("", err)
 
186
        self.assertTrue(isinstance(
 
187
            bzrdir.BzrDir.open(self.get_url('format_5_branch'))._format,
 
188
            bzrdir.BzrDirMetaFormat1))
 
189
        self.assertTrue(t.has(backup_dir2))
148
190
 
149
191
class SFTPTests(TestCaseWithSFTPServer):
150
192
    """Tests for upgrade over sftp."""
151
193
 
152
 
    def setUp(self):
153
 
        super(SFTPTests, self).setUp()
154
 
        self.old_ui_factory = ui.ui_factory
155
 
        self.addCleanup(self.restoreDefaults)
156
 
 
157
 
        ui.ui_factory = TestUIFactory()
158
 
 
159
 
    def restoreDefaults(self):
160
 
        ui.ui_factory = self.old_ui_factory
161
 
 
162
194
    def test_upgrade_url(self):
163
195
        self.run_bzr('init --format=weave')
164
 
        t = get_transport(self.get_url())
 
196
        t = transport.get_transport(self.get_url())
165
197
        url = t.base
166
198
        out, err = self.run_bzr(['upgrade', '--format=knit', url])
 
199
        backup_dir = 'backup.bzr.~1~'
167
200
        self.assertEqualDiff("""starting upgrade of %s
168
201
making backup of %s.bzr
169
 
  to %sbackup.bzr
 
202
  to %s%s
170
203
starting upgrade from format 6 to metadir
171
204
starting repository conversion
172
205
repository converted
173
206
finished
174
 
""" % (url, url, url), out)
 
207
""" % (url, url, url,backup_dir), out)
175
208
        self.assertEqual('', err)
176
209
 
177
210
 
178
 
class UpgradeRecommendedTests(TestCaseInTempDir):
 
211
class UpgradeRecommendedTests(TestCaseWithTransport):
179
212
 
180
213
    def test_recommend_upgrade_wt4(self):
181
214
        # using a deprecated format gives a warning
191
224
        out, err = self.run_bzr('revno a')
192
225
        if err.find('upgrade') > -1:
193
226
            self.fail("message shouldn't suggest upgrade:\n%s" % err)
 
227
 
 
228
    def test_upgrade_shared_repo(self):
 
229
        repo = self.make_repository('repo', format='2a', shared=True)
 
230
        branch = self.make_branch_and_tree('repo/branch', format="pack-0.92")
 
231
        self.get_transport('repo/branch/.bzr/repository').delete_tree('.')
 
232
        out, err = self.run_bzr(['upgrade'], working_dir='repo/branch')