← 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

Merge 2.0 into 2.1 including fixes for #262450, #373898, #498409

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_upgrade.py
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,
 
30
    posix_permissions_feature,
29
31
    )
30
32
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
31
33
from bzrlib.transport import get_transport
38
40
 
39
41
    def setUp(self):
40
42
        super(TestWithUpgradableBranches, self).setUp()
41
 
        self.addCleanup(bzrdir.BzrDirFormat._set_default_format,
42
 
                        bzrdir.BzrDirFormat.get_default_format())
 
43
        self.old_format = bzrdir.BzrDirFormat.get_default_format()
 
44
        self.old_ui_factory = ui.ui_factory
 
45
        self.addCleanup(self.restoreDefaults)
 
46
        ui.ui_factory = TestUIFactory()
 
47
 
 
48
    def restoreDefaults(self):
 
49
        ui.ui_factory = self.old_ui_factory
 
50
        bzrdir.BzrDirFormat._set_default_format(self.old_format)
43
51
 
44
52
    def make_current_format_branch_and_checkout(self):
45
53
        current_tree = self.make_branch_and_tree('current_format_branch',
104
112
        url = get_transport(self.get_url('format_5_branch')).base
105
113
        # check --format takes effect
106
114
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
107
 
        backup_dir = 'backup.bzr.~1~'
108
115
        (out, err) = self.run_bzr(
109
116
            ['upgrade', '--format=metaweave', url])
110
117
        self.assertEqualDiff("""starting upgrade of %s
111
118
making backup of %s.bzr
112
 
  to %s%s
 
119
  to %sbackup.bzr
113
120
starting upgrade from format 5 to 6
114
121
adding prefixes to weaves
115
122
adding prefixes to revision-store
116
123
starting upgrade from format 6 to metadir
117
124
finished
118
 
""" % (url, url, url, backup_dir), out)
 
125
""" % (url, url, url), out)
119
126
        self.assertEqualDiff("", err)
120
127
        self.assertTrue(isinstance(
121
128
            bzrdir.BzrDir.open(self.get_url('format_5_branch'))._format,
128
135
        url = get_transport(self.get_url('metadir_weave_branch')).base
129
136
        # check --format takes effect
130
137
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
131
 
        backup_dir = 'backup.bzr.~1~'
132
138
        (out, err) = self.run_bzr(
133
139
            ['upgrade', '--format=knit', url])
134
140
        self.assertEqualDiff("""starting upgrade of %s
135
141
making backup of %s.bzr
136
 
  to %s%s
 
142
  to %sbackup.bzr
137
143
starting repository conversion
138
144
repository converted
139
145
finished
140
 
""" % (url, url, url, backup_dir), out)
 
146
""" % (url, url, url), out)
141
147
        self.assertEqualDiff("", err)
142
148
        converted_dir = bzrdir.BzrDir.open(self.get_url('metadir_weave_branch'))
143
149
        self.assertTrue(isinstance(converted_dir._format,
151
157
 
152
158
    def test_upgrade_permission_check(self):
153
159
        """'backup.bzr' should retain permissions of .bzr. Bug #262450"""
154
 
        self.requireFeature(features.posix_permissions_feature)
 
160
        self.requireFeature(posix_permissions_feature)
 
161
        import os, stat
155
162
        old_perms = stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR
156
 
        backup_dir = 'backup.bzr.~1~'
 
163
        backup_dir = 'backup.bzr'
157
164
        self.run_bzr('init --format=1.6')
158
165
        os.chmod('.bzr', old_perms)
159
166
        self.run_bzr('upgrade')
161
168
        self.assertTrue(new_perms == old_perms)
162
169
 
163
170
 
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
 
 
191
171
class SFTPTests(TestCaseWithSFTPServer):
192
172
    """Tests for upgrade over sftp."""
193
173
 
 
174
    def setUp(self):
 
175
        super(SFTPTests, self).setUp()
 
176
        self.old_ui_factory = ui.ui_factory
 
177
        self.addCleanup(self.restoreDefaults)
 
178
 
 
179
        ui.ui_factory = TestUIFactory()
 
180
 
 
181
    def restoreDefaults(self):
 
182
        ui.ui_factory = self.old_ui_factory
 
183
 
194
184
    def test_upgrade_url(self):
195
185
        self.run_bzr('init --format=weave')
196
186
        t = get_transport(self.get_url())
197
187
        url = t.base
198
188
        out, err = self.run_bzr(['upgrade', '--format=knit', url])
199
 
        backup_dir = 'backup.bzr.~1~'
200
189
        self.assertEqualDiff("""starting upgrade of %s
201
190
making backup of %s.bzr
202
 
  to %s%s
 
191
  to %sbackup.bzr
203
192
starting upgrade from format 6 to metadir
204
193
starting repository conversion
205
194
repository converted
206
195
finished
207
 
""" % (url, url, url,backup_dir), out)
 
196
""" % (url, url, url), out)
208
197
        self.assertEqual('', err)
209
198
 
210
199