← 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: Gary van der Merwe
  • Date: 2010-08-02 19:56:52 UTC
  • mfrom: (5050.3.18 2.2)
  • mto: (5050.3.19 2.2)
  • mto: This revision was merged to the branch mainline in revision 5371.
  • Revision ID: garyvdm@gmail.com-20100802195652-o1ppjemhwrr98i61
Merge lp:bzr/2.2.

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