← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2009-06-19 17:53:37 UTC
  • mto: This revision was merged to the branch mainline in revision 4466.
  • Revision ID: john@arbash-meinel.com-20090619175337-uozt3bntdd48lh4z
Update time_graph to use X:1 ratios rather than 0.xxx ratios.
It is just easier to track now that the new code is much faster.

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
 
    controldir,
24
 
    transport,
 
23
    repository,
 
24
    ui,
25
25
    )
26
26
from bzrlib.tests import (
27
 
    features,
 
27
    TestCaseInTempDir,
28
28
    TestCaseWithTransport,
 
29
    TestUIFactory,
29
30
    )
30
31
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
 
32
from bzrlib.transport import get_transport
31
33
from bzrlib.repofmt.knitrepo import (
32
34
    RepositoryFormatKnit1,
33
35
    )
37
39
 
38
40
    def setUp(self):
39
41
        super(TestWithUpgradableBranches, self).setUp()
40
 
        self.addCleanup(controldir.ControlDirFormat._set_default_format,
41
 
                        controldir.ControlDirFormat.get_default_format())
42
 
 
43
 
    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
 
44
51
        current_tree = self.make_branch_and_tree('current_format_branch',
45
52
                                                 format='default')
 
53
        self.make_branch_and_tree('metadir_weave_branch', format='metaweave')
46
54
        current_tree.branch.create_checkout(
47
55
            self.get_url('current_format_checkout'), lightweight=True)
48
56
 
49
 
    def make_format_5_branch(self):
50
 
        # setup a format 5 branch we can upgrade from.
51
 
        self.make_branch_and_tree('format_5_branch',
52
 
                                  format=bzrdir.BzrDirFormat5())
53
 
 
54
 
    def make_metadir_weave_branch(self):
55
 
        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)
56
60
 
57
61
    def test_readonly_url_error(self):
58
 
        self.make_format_5_branch()
59
62
        (out, err) = self.run_bzr(
60
63
            ['upgrade', self.get_readonly_url('format_5_branch')], retcode=3)
61
64
        self.assertEqual(out, "")
62
65
        self.assertEqual(err, "bzr: ERROR: Upgrade URL cannot work with readonly URLs.\n")
63
66
 
64
67
    def test_upgrade_up_to_date(self):
65
 
        self.make_current_format_branch_and_checkout()
66
68
        # when up to date we should get a message to that effect
67
69
        (out, err) = self.run_bzr('upgrade current_format_branch', retcode=3)
68
70
        self.assertEqual("", out)
71
73
                             "recent format.\n", err)
72
74
 
73
75
    def test_upgrade_up_to_date_checkout_warns_branch_left_alone(self):
74
 
        self.make_current_format_branch_and_checkout()
75
76
        # when upgrading a checkout, the branch location and a suggestion
76
77
        # to upgrade it should be emitted even if the checkout is up to
77
78
        # date
78
79
        (out, err) = self.run_bzr('upgrade current_format_checkout', retcode=3)
79
80
        self.assertEqual("This is a checkout. The branch (%s) needs to be "
80
81
                         "upgraded separately.\n"
81
 
                         % transport.get_transport(
82
 
                self.get_url('current_format_branch')).base,
 
82
                         % get_transport(self.get_url('current_format_branch')).base,
83
83
                         out)
84
84
        self.assertEqualDiff("bzr: ERROR: The branch format Meta "
85
85
                             "directory format 1 is already at the most "
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
 
        url = transport.get_transport(self.get_url('format_5_branch')).base
 
103
        url = get_transport(self.get_url('format_5_branch')).base
105
104
        # check --format takes effect
106
 
        controldir.ControlDirFormat._set_default_format(bzrdir.BzrDirFormat5())
107
 
        backup_dir = 'backup.bzr.~1~'
 
105
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
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
 
        url = transport.get_transport(self.get_url('metadir_weave_branch')).base
 
125
        url = get_transport(self.get_url('metadir_weave_branch')).base
129
126
        # check --format takes effect
130
 
        controldir.ControlDirFormat._set_default_format(bzrdir.BzrDirFormat5())
131
 
        backup_dir = 'backup.bzr.~1~'
 
127
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
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
 
        t = transport.get_transport(self.get_url('format_5_branch'))
167
 
        url = t.base
168
 
        controldir.ControlDirFormat._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
 
        t.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(t.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
 
        t = transport.get_transport(self.get_url())
 
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')