/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_upgrade.py

  • Committer: John Arbash Meinel
  • Date: 2009-06-12 18:05:15 UTC
  • mto: (4371.4.5 vila-better-heads)
  • mto: This revision was merged to the branch mainline in revision 4449.
  • Revision ID: john@arbash-meinel.com-20090612180515-t0cwbjsnve094oik
Add a failing test for handling nodes that are in the same linear chain.

It fails because the ancestry skipping causes us to miss the fact that the two nodes
are actually directly related. We could check at the beginning, as the 
code used to do, but I think that will be incomplete for the more-than-two
heads cases.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_upgrade.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2009 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
 
18
19
import os
19
 
import stat
20
20
 
21
21
from bzrlib import (
22
22
    bzrdir,
23
23
    repository,
 
24
    ui,
24
25
    )
25
26
from bzrlib.tests import (
26
 
    features,
27
27
    TestCaseInTempDir,
28
28
    TestCaseWithTransport,
 
29
    TestUIFactory,
29
30
    )
30
31
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
31
32
from bzrlib.transport import get_transport
38
39
 
39
40
    def setUp(self):
40
41
        super(TestWithUpgradableBranches, self).setUp()
41
 
        self.addCleanup(bzrdir.BzrDirFormat._set_default_format,
42
 
                        bzrdir.BzrDirFormat.get_default_format())
43
 
 
44
 
    def make_current_format_branch_and_checkout(self):
 
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()
 
47
        # setup a format 5 branch we can upgrade from.
 
48
        self.make_branch_and_tree('format_5_branch',
 
49
                                  format=bzrdir.BzrDirFormat5())
 
50
 
45
51
        current_tree = self.make_branch_and_tree('current_format_branch',
46
52
                                                 format='default')
 
53
        self.make_branch_and_tree('metadir_weave_branch', format='metaweave')
47
54
        current_tree.branch.create_checkout(
48
55
            self.get_url('current_format_checkout'), lightweight=True)
49
56
 
50
 
    def make_format_5_branch(self):
51
 
        # setup a format 5 branch we can upgrade from.
52
 
        self.make_branch_and_tree('format_5_branch',
53
 
                                  format=bzrdir.BzrDirFormat5())
54
 
 
55
 
    def make_metadir_weave_branch(self):
56
 
        self.make_branch_and_tree('metadir_weave_branch', format='metaweave')
 
57
    def restoreDefaults(self):
 
58
        ui.ui_factory = self.old_ui_factory
 
59
        bzrdir.BzrDirFormat._set_default_format(self.old_format)
57
60
 
58
61
    def test_readonly_url_error(self):
59
 
        self.make_format_5_branch()
60
62
        (out, err) = self.run_bzr(
61
63
            ['upgrade', self.get_readonly_url('format_5_branch')], retcode=3)
62
64
        self.assertEqual(out, "")
63
65
        self.assertEqual(err, "bzr: ERROR: Upgrade URL cannot work with readonly URLs.\n")
64
66
 
65
67
    def test_upgrade_up_to_date(self):
66
 
        self.make_current_format_branch_and_checkout()
67
68
        # when up to date we should get a message to that effect
68
69
        (out, err) = self.run_bzr('upgrade current_format_branch', retcode=3)
69
70
        self.assertEqual("", out)
72
73
                             "recent format.\n", err)
73
74
 
74
75
    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
100
100
 
101
101
    def test_upgrade_explicit_metaformat(self):
102
102
        # users can force an upgrade to metadir format.
103
 
        self.make_format_5_branch()
104
103
        url = get_transport(self.get_url('format_5_branch')).base
105
104
        # check --format takes effect
106
105
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
107
 
        backup_dir = 'backup.bzr.~1~'
108
106
        (out, err) = self.run_bzr(
109
107
            ['upgrade', '--format=metaweave', url])
110
108
        self.assertEqualDiff("""starting upgrade of %s
111
109
making backup of %s.bzr
112
 
  to %s%s
 
110
  to %sbackup.bzr
113
111
starting upgrade from format 5 to 6
114
112
adding prefixes to weaves
115
113
adding prefixes to revision-store
116
114
starting upgrade from format 6 to metadir
117
115
finished
118
 
""" % (url, url, url, backup_dir), out)
 
116
""" % (url, url, url), out)
119
117
        self.assertEqualDiff("", err)
120
118
        self.assertTrue(isinstance(
121
119
            bzrdir.BzrDir.open(self.get_url('format_5_branch'))._format,
124
122
    def test_upgrade_explicit_knit(self):
125
123
        # users can force an upgrade to knit format from a metadir weave
126
124
        # branch
127
 
        self.make_metadir_weave_branch()
128
125
        url = get_transport(self.get_url('metadir_weave_branch')).base
129
126
        # check --format takes effect
130
127
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
131
 
        backup_dir = 'backup.bzr.~1~'
132
128
        (out, err) = self.run_bzr(
133
129
            ['upgrade', '--format=knit', url])
134
130
        self.assertEqualDiff("""starting upgrade of %s
135
131
making backup of %s.bzr
136
 
  to %s%s
 
132
  to %sbackup.bzr
137
133
starting repository conversion
138
134
repository converted
139
135
finished
140
 
""" % (url, url, url, backup_dir), out)
 
136
""" % (url, url, url), out)
141
137
        self.assertEqualDiff("", err)
142
138
        converted_dir = bzrdir.BzrDir.open(self.get_url('metadir_weave_branch'))
143
139
        self.assertTrue(isinstance(converted_dir._format,
149
145
        self.run_bzr('init-repository --format=metaweave repo')
150
146
        self.run_bzr('upgrade --format=knit repo')
151
147
 
152
 
    def test_upgrade_permission_check(self):
153
 
        """'backup.bzr' should retain permissions of .bzr. Bug #262450"""
154
 
        self.requireFeature(features.posix_permissions_feature)
155
 
        old_perms = stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR
156
 
        backup_dir = 'backup.bzr.~1~'
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
 
 
163
 
 
164
 
    def test_upgrade_with_existing_backup_dir(self):
165
 
        self.make_format_5_branch()
166
 
        transport = get_transport(self.get_url('format_5_branch'))
167
 
        url = transport.base
168
 
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
169
 
        backup_dir1 = 'backup.bzr.~1~'
170
 
        backup_dir2 = 'backup.bzr.~2~'
171
 
        # explicitly create backup_dir1. bzr should create the .~2~ directory
172
 
        # as backup
173
 
        transport.mkdir(backup_dir1)
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))
189
 
        self.assertTrue(transport.has(backup_dir2))
190
148
 
191
149
class SFTPTests(TestCaseWithSFTPServer):
192
150
    """Tests for upgrade over sftp."""
193
151
 
 
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
 
194
162
    def test_upgrade_url(self):
195
163
        self.run_bzr('init --format=weave')
196
164
        t = get_transport(self.get_url())
197
165
        url = t.base
198
166
        out, err = self.run_bzr(['upgrade', '--format=knit', url])
199
 
        backup_dir = 'backup.bzr.~1~'
200
167
        self.assertEqualDiff("""starting upgrade of %s
201
168
making backup of %s.bzr
202
 
  to %s%s
 
169
  to %sbackup.bzr
203
170
starting upgrade from format 6 to metadir
204
171
starting repository conversion
205
172
repository converted
206
173
finished
207
 
""" % (url, url, url,backup_dir), out)
 
174
""" % (url, url, url), out)
208
175
        self.assertEqual('', err)
209
176
 
210
177
 
211
 
class UpgradeRecommendedTests(TestCaseWithTransport):
 
178
class UpgradeRecommendedTests(TestCaseInTempDir):
212
179
 
213
180
    def test_recommend_upgrade_wt4(self):
214
181
        # using a deprecated format gives a warning
224
191
        out, err = self.run_bzr('revno a')
225
192
        if err.find('upgrade') > -1:
226
193
            self.fail("message shouldn't suggest upgrade:\n%s" % err)
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')