3882.7.13
by Martin Pool
Don't mask out recommend_upgrade in CLIUIFactory |
1 |
# Copyright (C) 2006, 2007, 2009 Canonical Ltd
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
1534.4.13
by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url. |
3 |
# This program is free software; you can redistribute it and/or modify
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
7 |
#
|
1534.4.13
by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url. |
8 |
# This program is distributed in the hope that it will be useful,
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
12 |
#
|
1534.4.13
by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url. |
13 |
# You should have received a copy of the GNU General Public License
|
14 |
# along with this program; if not, write to the Free Software
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
1534.4.13
by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url. |
16 |
|
17 |
"""Black box tests for the upgrade ui."""
|
|
18 |
||
2323.6.1
by Martin Pool
(broken) Give a message when opening old workingtree formats suggesting upgrade |
19 |
from bzrlib import ( |
20 |
bzrdir, |
|
21 |
repository, |
|
22 |
)
|
|
23 |
from bzrlib.tests import ( |
|
24 |
TestCaseInTempDir, |
|
25 |
TestCaseWithTransport, |
|
26 |
)
|
|
1666.1.3
by Robert Collins
Fix and test upgrades from bzrdir 6 over SFTP. |
27 |
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer |
1534.4.13
by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url. |
28 |
from bzrlib.transport import get_transport |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
29 |
from bzrlib.repofmt.knitrepo import ( |
30 |
RepositoryFormatKnit1, |
|
31 |
)
|
|
1534.5.9
by Robert Collins
Advise users running upgrade on a checkout to also run it on the branch. |
32 |
|
33 |
||
1534.5.6
by Robert Collins
split out converter logic into per-format objects. |
34 |
class TestWithUpgradableBranches(TestCaseWithTransport): |
1534.4.13
by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url. |
35 |
|
36 |
def setUp(self): |
|
1534.5.6
by Robert Collins
split out converter logic into per-format objects. |
37 |
super(TestWithUpgradableBranches, self).setUp() |
4985.2.1
by Vincent Ladeuil
Deploy addAttrCleanup on the whole test suite. |
38 |
self.addCleanup(bzrdir.BzrDirFormat._set_default_format, |
39 |
bzrdir.BzrDirFormat.get_default_format()) |
|
4608.1.1
by Martin Pool
Refactor blackbox.test_upgrade to do less work from setUp() |
40 |
|
41 |
def make_current_format_branch_and_checkout(self): |
|
42 |
current_tree = self.make_branch_and_tree('current_format_branch', |
|
43 |
format='default') |
|
44 |
current_tree.branch.create_checkout( |
|
45 |
self.get_url('current_format_checkout'), lightweight=True) |
|
46 |
||
47 |
def make_format_5_branch(self): |
|
1534.4.13
by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url. |
48 |
# setup a format 5 branch we can upgrade from.
|
2204.4.11
by Aaron Bentley
deprecate Repository.set_default_format, update upgrade tests |
49 |
self.make_branch_and_tree('format_5_branch', |
50 |
format=bzrdir.BzrDirFormat5()) |
|
51 |
||
4608.1.1
by Martin Pool
Refactor blackbox.test_upgrade to do less work from setUp() |
52 |
def make_metadir_weave_branch(self): |
2204.4.11
by Aaron Bentley
deprecate Repository.set_default_format, update upgrade tests |
53 |
self.make_branch_and_tree('metadir_weave_branch', format='metaweave') |
1534.4.13
by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url. |
54 |
|
55 |
def test_readonly_url_error(self): |
|
4608.1.1
by Martin Pool
Refactor blackbox.test_upgrade to do less work from setUp() |
56 |
self.make_format_5_branch() |
2530.3.4
by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr |
57 |
(out, err) = self.run_bzr( |
58 |
['upgrade', self.get_readonly_url('format_5_branch')], retcode=3) |
|
1534.4.13
by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url. |
59 |
self.assertEqual(out, "") |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
60 |
self.assertEqual(err, "bzr: ERROR: Upgrade URL cannot work with readonly URLs.\n") |
1534.5.6
by Robert Collins
split out converter logic into per-format objects. |
61 |
|
62 |
def test_upgrade_up_to_date(self): |
|
4608.1.1
by Martin Pool
Refactor blackbox.test_upgrade to do less work from setUp() |
63 |
self.make_current_format_branch_and_checkout() |
1534.5.6
by Robert Collins
split out converter logic into per-format objects. |
64 |
# when up to date we should get a message to that effect
|
2552.2.3
by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests. |
65 |
(out, err) = self.run_bzr('upgrade current_format_branch', retcode=3) |
1534.5.6
by Robert Collins
split out converter logic into per-format objects. |
66 |
self.assertEqual("", out) |
4032.3.2
by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls. |
67 |
self.assertEqualDiff("bzr: ERROR: The branch format Meta " |
68 |
"directory format 1 is already at the most "
|
|
1534.5.7
by Robert Collins
Start factoring out the upgrade policy logic. |
69 |
"recent format.\n", err) |
1534.5.6
by Robert Collins
split out converter logic into per-format objects. |
70 |
|
71 |
def test_upgrade_up_to_date_checkout_warns_branch_left_alone(self): |
|
4608.1.1
by Martin Pool
Refactor blackbox.test_upgrade to do less work from setUp() |
72 |
self.make_current_format_branch_and_checkout() |
1534.5.6
by Robert Collins
split out converter logic into per-format objects. |
73 |
# when upgrading a checkout, the branch location and a suggestion
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
74 |
# to upgrade it should be emitted even if the checkout is up to
|
1534.5.6
by Robert Collins
split out converter logic into per-format objects. |
75 |
# date
|
2552.2.3
by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests. |
76 |
(out, err) = self.run_bzr('upgrade current_format_checkout', retcode=3) |
1534.5.9
by Robert Collins
Advise users running upgrade on a checkout to also run it on the branch. |
77 |
self.assertEqual("This is a checkout. The branch (%s) needs to be " |
2552.2.4
by Vincent Ladeuil
Merge bzr.dev and resolve conflits. (good use case for an enhanced merge |
78 |
"upgraded separately.\n" |
1534.5.9
by Robert Collins
Advise users running upgrade on a checkout to also run it on the branch. |
79 |
% get_transport(self.get_url('current_format_branch')).base, |
80 |
out) |
|
4032.3.2
by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls. |
81 |
self.assertEqualDiff("bzr: ERROR: The branch format Meta " |
82 |
"directory format 1 is already at the most "
|
|
1534.5.9
by Robert Collins
Advise users running upgrade on a checkout to also run it on the branch. |
83 |
"recent format.\n", err) |
1534.5.6
by Robert Collins
split out converter logic into per-format objects. |
84 |
|
85 |
def test_upgrade_checkout(self): |
|
86 |
# upgrading a checkout should work
|
|
87 |
pass
|
|
88 |
||
89 |
def test_upgrade_repository_scans_branches(self): |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
90 |
# we should get individual upgrade notes for each branch even the
|
1534.5.6
by Robert Collins
split out converter logic into per-format objects. |
91 |
# anonymous branch
|
92 |
pass
|
|
93 |
||
94 |
def test_ugrade_branch_in_repo(self): |
|
95 |
# upgrading a branch in a repo should warn about not upgrading the repo
|
|
96 |
pass
|
|
1534.5.13
by Robert Collins
Correct buggy test. |
97 |
|
98 |
def test_upgrade_explicit_metaformat(self): |
|
99 |
# users can force an upgrade to metadir format.
|
|
4608.1.1
by Martin Pool
Refactor blackbox.test_upgrade to do less work from setUp() |
100 |
self.make_format_5_branch() |
1534.5.13
by Robert Collins
Correct buggy test. |
101 |
url = get_transport(self.get_url('format_5_branch')).base |
1857.1.20
by Aaron Bentley
Strip out all the EnumOption stuff |
102 |
# check --format takes effect
|
2204.4.13
by Aaron Bentley
Update all test cases to avoid set_default_format |
103 |
bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5()) |
2530.3.4
by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr |
104 |
(out, err) = self.run_bzr( |
1857.1.20
by Aaron Bentley
Strip out all the EnumOption stuff |
105 |
['upgrade', '--format=metaweave', url]) |
1534.5.13
by Robert Collins
Correct buggy test. |
106 |
self.assertEqualDiff("""starting upgrade of %s |
3943.2.4
by Martin Pool
Move backup progress indicators from upgrade.py into backup_bzrdir, and tweak text |
107 |
making backup of %s.bzr |
108 |
to %sbackup.bzr |
|
1534.5.13
by Robert Collins
Correct buggy test. |
109 |
starting upgrade from format 5 to 6
|
110 |
adding prefixes to weaves
|
|
111 |
adding prefixes to revision-store
|
|
112 |
starting upgrade from format 6 to metadir
|
|
113 |
finished
|
|
114 |
""" % (url, url, url), out) |
|
115 |
self.assertEqualDiff("", err) |
|
116 |
self.assertTrue(isinstance( |
|
117 |
bzrdir.BzrDir.open(self.get_url('format_5_branch'))._format, |
|
118 |
bzrdir.BzrDirMetaFormat1)) |
|
1556.1.4
by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same. |
119 |
|
120 |
def test_upgrade_explicit_knit(self): |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
121 |
# users can force an upgrade to knit format from a metadir weave
|
1556.1.4
by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same. |
122 |
# branch
|
4608.1.1
by Martin Pool
Refactor blackbox.test_upgrade to do less work from setUp() |
123 |
self.make_metadir_weave_branch() |
1556.1.4
by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same. |
124 |
url = get_transport(self.get_url('metadir_weave_branch')).base |
1857.1.20
by Aaron Bentley
Strip out all the EnumOption stuff |
125 |
# check --format takes effect
|
2204.4.13
by Aaron Bentley
Update all test cases to avoid set_default_format |
126 |
bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5()) |
2530.3.4
by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr |
127 |
(out, err) = self.run_bzr( |
1857.1.20
by Aaron Bentley
Strip out all the EnumOption stuff |
128 |
['upgrade', '--format=knit', url]) |
1556.1.4
by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same. |
129 |
self.assertEqualDiff("""starting upgrade of %s |
3943.2.4
by Martin Pool
Move backup progress indicators from upgrade.py into backup_bzrdir, and tweak text |
130 |
making backup of %s.bzr |
131 |
to %sbackup.bzr |
|
1556.1.4
by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same. |
132 |
starting repository conversion
|
133 |
repository converted
|
|
134 |
finished
|
|
135 |
""" % (url, url, url), out) |
|
136 |
self.assertEqualDiff("", err) |
|
137 |
converted_dir = bzrdir.BzrDir.open(self.get_url('metadir_weave_branch')) |
|
138 |
self.assertTrue(isinstance(converted_dir._format, |
|
139 |
bzrdir.BzrDirMetaFormat1)) |
|
140 |
self.assertTrue(isinstance(converted_dir.open_repository()._format, |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
141 |
RepositoryFormatKnit1)) |
1558.7.2
by Aaron Bentley
Upgrade works in repositories |
142 |
|
143 |
def test_upgrade_repo(self): |
|
2552.2.3
by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests. |
144 |
self.run_bzr('init-repository --format=metaweave repo') |
145 |
self.run_bzr('upgrade --format=knit repo') |
|
1666.1.3
by Robert Collins
Fix and test upgrades from bzrdir 6 over SFTP. |
146 |
|
147 |
||
148 |
class SFTPTests(TestCaseWithSFTPServer): |
|
149 |
"""Tests for upgrade over sftp."""
|
|
150 |
||
151 |
def test_upgrade_url(self): |
|
2552.2.3
by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests. |
152 |
self.run_bzr('init --format=weave') |
1666.1.3
by Robert Collins
Fix and test upgrades from bzrdir 6 over SFTP. |
153 |
t = get_transport(self.get_url()) |
154 |
url = t.base |
|
2552.2.3
by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests. |
155 |
out, err = self.run_bzr(['upgrade', '--format=knit', url]) |
1666.1.3
by Robert Collins
Fix and test upgrades from bzrdir 6 over SFTP. |
156 |
self.assertEqualDiff("""starting upgrade of %s |
3943.2.4
by Martin Pool
Move backup progress indicators from upgrade.py into backup_bzrdir, and tweak text |
157 |
making backup of %s.bzr |
158 |
to %sbackup.bzr |
|
1666.1.3
by Robert Collins
Fix and test upgrades from bzrdir 6 over SFTP. |
159 |
starting upgrade from format 6 to metadir
|
160 |
starting repository conversion
|
|
161 |
repository converted
|
|
162 |
finished
|
|
163 |
""" % (url, url, url), out) |
|
164 |
self.assertEqual('', err) |
|
2323.6.1
by Martin Pool
(broken) Give a message when opening old workingtree formats suggesting upgrade |
165 |
|
166 |
||
4634.2.1
by Robert Collins
Fix regression in upgrade introduced with the change to upgrade in rev 4622. |
167 |
class UpgradeRecommendedTests(TestCaseWithTransport): |
2323.6.1
by Martin Pool
(broken) Give a message when opening old workingtree formats suggesting upgrade |
168 |
|
169 |
def test_recommend_upgrade_wt4(self): |
|
170 |
# using a deprecated format gives a warning
|
|
2552.2.3
by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests. |
171 |
self.run_bzr('init --knit a') |
172 |
out, err = self.run_bzr('status a') |
|
2323.6.1
by Martin Pool
(broken) Give a message when opening old workingtree formats suggesting upgrade |
173 |
self.assertContainsRe(err, 'bzr upgrade .*[/\\\\]a') |
2323.5.19
by Martin Pool
No upgrade recommendation on source when cloning |
174 |
|
175 |
def test_no_upgrade_recommendation_from_bzrdir(self): |
|
176 |
# we should only get a recommendation to upgrade when we're accessing
|
|
177 |
# the actual workingtree, not when we only open a bzrdir that contains
|
|
178 |
# an old workngtree
|
|
2552.2.3
by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests. |
179 |
self.run_bzr('init --knit a') |
3123.5.22
by Aaron Bentley
Change failing test to use another command, since checkout now uses trees |
180 |
out, err = self.run_bzr('revno a') |
2323.5.19
by Martin Pool
No upgrade recommendation on source when cloning |
181 |
if err.find('upgrade') > -1: |
182 |
self.fail("message shouldn't suggest upgrade:\n%s" % err) |
|
4634.2.1
by Robert Collins
Fix regression in upgrade introduced with the change to upgrade in rev 4622. |
183 |
|
184 |
def test_upgrade_shared_repo(self): |
|
185 |
repo = self.make_repository('repo', format='2a', shared=True) |
|
186 |
branch = self.make_branch_and_tree('repo/branch', format="pack-0.92") |
|
187 |
self.get_transport('repo/branch/.bzr/repository').delete_tree('.') |
|
188 |
out, err = self.run_bzr(['upgrade'], working_dir='repo/branch') |