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