~bzr-pqm/bzr/bzr.dev

4597.9.2 by Vincent Ladeuil
Merge bzr.dev into cleanup
1
# Copyright (C) 2006-2010 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."""
5036.3.8 by Parth Malwankar
closed review comments from vila
18
import os
19
import stat
1534.4.13 by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url.
20
2323.6.1 by Martin Pool
(broken) Give a message when opening old workingtree formats suggesting upgrade
21
from bzrlib import (
22
    bzrdir,
23
    repository,
5273.1.7 by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through
24
    transport,
2323.6.1 by Martin Pool
(broken) Give a message when opening old workingtree formats suggesting upgrade
25
    )
26
from bzrlib.tests import (
5036.3.8 by Parth Malwankar
closed review comments from vila
27
    features,
2323.6.1 by Martin Pool
(broken) Give a message when opening old workingtree formats suggesting upgrade
28
    TestCaseInTempDir,
29
    TestCaseWithTransport,
30
    )
1666.1.3 by Robert Collins
Fix and test upgrades from bzrdir 6 over SFTP.
31
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
32
from bzrlib.repofmt.knitrepo import (
33
    RepositoryFormatKnit1,
34
    )
1534.5.9 by Robert Collins
Advise users running upgrade on a checkout to also run it on the branch.
35
36
1534.5.6 by Robert Collins
split out converter logic into per-format objects.
37
class TestWithUpgradableBranches(TestCaseWithTransport):
1534.4.13 by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url.
38
39
    def setUp(self):
1534.5.6 by Robert Collins
split out converter logic into per-format objects.
40
        super(TestWithUpgradableBranches, self).setUp()
4985.2.1 by Vincent Ladeuil
Deploy addAttrCleanup on the whole test suite.
41
        self.addCleanup(bzrdir.BzrDirFormat._set_default_format,
42
                        bzrdir.BzrDirFormat.get_default_format())
4608.1.1 by Martin Pool
Refactor blackbox.test_upgrade to do less work from setUp()
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):
1534.4.13 by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url.
51
        # setup a format 5 branch we can upgrade from.
2204.4.11 by Aaron Bentley
deprecate Repository.set_default_format, update upgrade tests
52
        self.make_branch_and_tree('format_5_branch',
53
                                  format=bzrdir.BzrDirFormat5())
54
4608.1.1 by Martin Pool
Refactor blackbox.test_upgrade to do less work from setUp()
55
    def make_metadir_weave_branch(self):
2204.4.11 by Aaron Bentley
deprecate Repository.set_default_format, update upgrade tests
56
        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.
57
58
    def test_readonly_url_error(self):
4608.1.1 by Martin Pool
Refactor blackbox.test_upgrade to do less work from setUp()
59
        self.make_format_5_branch()
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
60
        (out, err) = self.run_bzr(
61
            ['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.
62
        self.assertEqual(out, "")
2067.3.1 by Martin Pool
Clean up BzrNewError, other exception classes and users.
63
        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.
64
65
    def test_upgrade_up_to_date(self):
4608.1.1 by Martin Pool
Refactor blackbox.test_upgrade to do less work from setUp()
66
        self.make_current_format_branch_and_checkout()
1534.5.6 by Robert Collins
split out converter logic into per-format objects.
67
        # 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.
68
        (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.
69
        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.
70
        self.assertEqualDiff("bzr: ERROR: The branch format Meta "
71
                             "directory format 1 is already at the most "
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
72
                             "recent format.\n", err)
1534.5.6 by Robert Collins
split out converter logic into per-format objects.
73
74
    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()
75
        self.make_current_format_branch_and_checkout()
1534.5.6 by Robert Collins
split out converter logic into per-format objects.
76
        # when upgrading a checkout, the branch location and a suggestion
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
77
        # 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.
78
        # date
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
79
        (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.
80
        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
81
                         "upgraded separately.\n"
5273.1.7 by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through
82
                         % transport.get_transport(
83
                self.get_url('current_format_branch')).base,
1534.5.9 by Robert Collins
Advise users running upgrade on a checkout to also run it on the branch.
84
                         out)
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
85
        self.assertEqualDiff("bzr: ERROR: The branch format Meta "
86
                             "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.
87
                             "recent format.\n", err)
1534.5.6 by Robert Collins
split out converter logic into per-format objects.
88
89
    def test_upgrade_checkout(self):
90
        # upgrading a checkout should work
91
        pass
92
93
    def test_upgrade_repository_scans_branches(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
94
        # 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.
95
        # anonymous branch
96
        pass
97
98
    def test_ugrade_branch_in_repo(self):
99
        # upgrading a branch in a repo should warn about not upgrading the repo
100
        pass
1534.5.13 by Robert Collins
Correct buggy test.
101
102
    def test_upgrade_explicit_metaformat(self):
103
        # users can force an upgrade to metadir format.
4608.1.1 by Martin Pool
Refactor blackbox.test_upgrade to do less work from setUp()
104
        self.make_format_5_branch()
5273.1.7 by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through
105
        url = transport.get_transport(self.get_url('format_5_branch')).base
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
106
        # check --format takes effect
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
107
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
5035.4.3 by Parth Malwankar
updated existing upgrade tests to work.
108
        backup_dir = 'backup.bzr.~1~'
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
109
        (out, err) = self.run_bzr(
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
110
            ['upgrade', '--format=metaweave', url])
1534.5.13 by Robert Collins
Correct buggy test.
111
        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
112
making backup of %s.bzr
5035.4.3 by Parth Malwankar
updated existing upgrade tests to work.
113
  to %s%s
1534.5.13 by Robert Collins
Correct buggy test.
114
starting upgrade from format 5 to 6
115
adding prefixes to weaves
116
adding prefixes to revision-store
117
starting upgrade from format 6 to metadir
118
finished
5035.4.3 by Parth Malwankar
updated existing upgrade tests to work.
119
""" % (url, url, url, backup_dir), out)
1534.5.13 by Robert Collins
Correct buggy test.
120
        self.assertEqualDiff("", err)
121
        self.assertTrue(isinstance(
122
            bzrdir.BzrDir.open(self.get_url('format_5_branch'))._format,
123
            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.
124
125
    def test_upgrade_explicit_knit(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
126
        # 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.
127
        # branch
4608.1.1 by Martin Pool
Refactor blackbox.test_upgrade to do less work from setUp()
128
        self.make_metadir_weave_branch()
5273.1.7 by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through
129
        url = transport.get_transport(self.get_url('metadir_weave_branch')).base
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
130
        # check --format takes effect
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
131
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
5035.4.3 by Parth Malwankar
updated existing upgrade tests to work.
132
        backup_dir = 'backup.bzr.~1~'
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
133
        (out, err) = self.run_bzr(
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
134
            ['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.
135
        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
136
making backup of %s.bzr
5035.4.3 by Parth Malwankar
updated existing upgrade tests to work.
137
  to %s%s
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.
138
starting repository conversion
139
repository converted
140
finished
5035.4.3 by Parth Malwankar
updated existing upgrade tests to work.
141
""" % (url, url, url, backup_dir), out)
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.
142
        self.assertEqualDiff("", err)
143
        converted_dir = bzrdir.BzrDir.open(self.get_url('metadir_weave_branch'))
144
        self.assertTrue(isinstance(converted_dir._format,
145
                                   bzrdir.BzrDirMetaFormat1))
146
        self.assertTrue(isinstance(converted_dir.open_repository()._format,
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
147
                                   RepositoryFormatKnit1))
1558.7.2 by Aaron Bentley
Upgrade works in repositories
148
149
    def test_upgrade_repo(self):
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
150
        self.run_bzr('init-repository --format=metaweave repo')
151
        self.run_bzr('upgrade --format=knit repo')
1666.1.3 by Robert Collins
Fix and test upgrades from bzrdir 6 over SFTP.
152
4634.148.1 by Martin Pool
Backport fix for permissions of backup.bzr
153
    def test_upgrade_permission_check(self):
154
        """'backup.bzr' should retain permissions of .bzr. Bug #262450"""
5094.3.2 by Martin Pool
Fix up feature name
155
        self.requireFeature(features.posix_permissions_feature)
4634.148.1 by Martin Pool
Backport fix for permissions of backup.bzr
156
        old_perms = stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR
5036.3.10 by Parth Malwankar
merged in trunk. fixed blackbox.test_upgrade to use backup.bzr.~N~ convention.
157
        backup_dir = 'backup.bzr.~1~'
4634.148.1 by Martin Pool
Backport fix for permissions of backup.bzr
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
1666.1.3 by Robert Collins
Fix and test upgrades from bzrdir 6 over SFTP.
164
5035.4.4 by Parth Malwankar
test updated to check for creation of backup.bzr.~2~ when backup.bzr.~1~ exists
165
    def test_upgrade_with_existing_backup_dir(self):
166
        self.make_format_5_branch()
5273.1.7 by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through
167
        t = transport.get_transport(self.get_url('format_5_branch'))
168
        url = t.base
5035.4.4 by Parth Malwankar
test updated to check for creation of backup.bzr.~2~ when backup.bzr.~1~ exists
169
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
170
        backup_dir1 = 'backup.bzr.~1~'
171
        backup_dir2 = 'backup.bzr.~2~'
5035.4.6 by Parth Malwankar
added doc to test
172
        # explicitly create backup_dir1. bzr should create the .~2~ directory
173
        # as backup
5273.1.7 by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through
174
        t.mkdir(backup_dir1)
5035.4.4 by Parth Malwankar
test updated to check for creation of backup.bzr.~2~ when backup.bzr.~1~ exists
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))
5273.1.7 by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through
190
        self.assertTrue(t.has(backup_dir2))
5035.4.4 by Parth Malwankar
test updated to check for creation of backup.bzr.~2~ when backup.bzr.~1~ exists
191
1666.1.3 by Robert Collins
Fix and test upgrades from bzrdir 6 over SFTP.
192
class SFTPTests(TestCaseWithSFTPServer):
193
    """Tests for upgrade over sftp."""
194
195
    def test_upgrade_url(self):
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
196
        self.run_bzr('init --format=weave')
5273.1.7 by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through
197
        t = transport.get_transport(self.get_url())
1666.1.3 by Robert Collins
Fix and test upgrades from bzrdir 6 over SFTP.
198
        url = t.base
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
199
        out, err = self.run_bzr(['upgrade', '--format=knit', url])
5035.4.3 by Parth Malwankar
updated existing upgrade tests to work.
200
        backup_dir = 'backup.bzr.~1~'
1666.1.3 by Robert Collins
Fix and test upgrades from bzrdir 6 over SFTP.
201
        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
202
making backup of %s.bzr
5035.4.3 by Parth Malwankar
updated existing upgrade tests to work.
203
  to %s%s
1666.1.3 by Robert Collins
Fix and test upgrades from bzrdir 6 over SFTP.
204
starting upgrade from format 6 to metadir
205
starting repository conversion
206
repository converted
207
finished
5035.4.3 by Parth Malwankar
updated existing upgrade tests to work.
208
""" % (url, url, url,backup_dir), out)
1666.1.3 by Robert Collins
Fix and test upgrades from bzrdir 6 over SFTP.
209
        self.assertEqual('', err)
2323.6.1 by Martin Pool
(broken) Give a message when opening old workingtree formats suggesting upgrade
210
211
4634.2.1 by Robert Collins
Fix regression in upgrade introduced with the change to upgrade in rev 4622.
212
class UpgradeRecommendedTests(TestCaseWithTransport):
2323.6.1 by Martin Pool
(broken) Give a message when opening old workingtree formats suggesting upgrade
213
214
    def test_recommend_upgrade_wt4(self):
215
        # using a deprecated format gives a warning
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
216
        self.run_bzr('init --knit a')
217
        out, err = self.run_bzr('status a')
2323.6.1 by Martin Pool
(broken) Give a message when opening old workingtree formats suggesting upgrade
218
        self.assertContainsRe(err, 'bzr upgrade .*[/\\\\]a')
2323.5.19 by Martin Pool
No upgrade recommendation on source when cloning
219
220
    def test_no_upgrade_recommendation_from_bzrdir(self):
221
        # we should only get a recommendation to upgrade when we're accessing
222
        # the actual workingtree, not when we only open a bzrdir that contains
223
        # an old workngtree
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
224
        self.run_bzr('init --knit a')
3123.5.22 by Aaron Bentley
Change failing test to use another command, since checkout now uses trees
225
        out, err = self.run_bzr('revno a')
2323.5.19 by Martin Pool
No upgrade recommendation on source when cloning
226
        if err.find('upgrade') > -1:
227
            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.
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')