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