/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 breezy/tests/blackbox/test_upgrade.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-08 23:30:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170608233031-3qavls2o7a1pqllj
Update imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_upgrade.py
19
19
import stat
20
20
 
21
21
from breezy import (
22
 
    bzr,
 
22
    bzrdir,
23
23
    controldir,
24
24
    lockable_files,
25
25
    ui,
26
26
    urlutils,
27
27
    )
28
 
from breezy.bzr import (
29
 
    bzrdir,
30
 
    )
31
28
from breezy.tests import (
32
29
    features,
33
30
    TestCaseWithTransport,
34
31
    )
35
32
from breezy.tests.test_sftp_transport import TestCaseWithSFTPServer
36
 
from breezy.bzr.knitpack_repo import RepositoryFormatKnitPack1
 
33
from breezy.repofmt.knitpack_repo import RepositoryFormatKnitPack1
37
34
 
38
35
 
39
36
class OldBzrDir(bzrdir.BzrDirMeta1):
64
61
 
65
62
    @classmethod
66
63
    def get_format_string(cls):
67
 
        return b"Ancient Test Format"
 
64
        return "Ancient Test Format"
68
65
 
69
66
    def _open(self, transport):
70
67
        return OldBzrDir(transport, self)
131
128
 
132
129
    def test_upgrade_control_dir(self):
133
130
        old_format = OldBzrDirFormat()
134
 
        self.addCleanup(bzr.BzrProber.formats.remove,
135
 
                        old_format.get_format_string())
136
 
        bzr.BzrProber.formats.register(old_format.get_format_string(),
137
 
                                       old_format)
 
131
        self.addCleanup(bzrdir.BzrProber.formats.remove,
 
132
            old_format.get_format_string())
 
133
        bzrdir.BzrProber.formats.register(old_format.get_format_string(),
 
134
            old_format)
138
135
        self.addCleanup(controldir.ControlDirFormat._set_default_format,
139
136
                        controldir.ControlDirFormat.get_default_format())
140
137
 
180
177
repository converted
181
178
finished
182
179
""" % (display_url, display_url, display_url, display_url, backup_dir),
183
 
            out)
 
180
                             out)
184
181
        self.assertEqualDiff("", err)
185
182
        converted_dir = controldir.ControlDir.open(self.get_url('branch'))
186
183
        self.assertTrue(isinstance(converted_dir._format,
189
186
                                   RepositoryFormatKnitPack1))
190
187
 
191
188
    def test_upgrade_repo(self):
192
 
        self.run_bzr('init-shared-repository --format=pack-0.92 repo')
 
189
        self.run_bzr('init-repository --format=pack-0.92 repo')
193
190
        self.run_bzr('upgrade --format=2a repo')
194
191
 
195
192
    def assertLegalOption(self, option_str):
199
196
        self.run_bzr('upgrade --format=2a branch-foo %s' % (option_str,))
200
197
 
201
198
    def assertBranchFormat(self, dir, format):
202
 
        branch = controldir.ControlDir.open_tree_or_branch(self.get_url(dir))[
203
 
            1]
 
199
        branch = controldir.ControlDir.open_tree_or_branch(self.get_url(dir))[1]
204
200
        branch_format = branch._format
205
 
        meta_format = controldir.format_registry.make_controldir(format)
 
201
        meta_format = controldir.format_registry.make_bzrdir(format)
206
202
        expected_format = meta_format.get_branch_format()
207
203
        self.assertEqual(expected_format, branch_format)
208
204
 
249
245
""" % (display_url, display_url, display_url, display_url, backup_dir2), out)
250
246
        self.assertEqualDiff("", err)
251
247
        self.assertTrue(isinstance(
252
 
            controldir.ControlDir.open(
253
 
                self.get_url("old_format_branch"))._format,
 
248
            controldir.ControlDir.open(self.get_url("old_format_branch"))._format,
254
249
            bzrdir.BzrDirMetaFormat1))
255
250
        self.assertTrue(t.has(backup_dir2))
256
251
 
263
258
        t = self.get_transport()
264
259
        url = t.base
265
260
        display_url = urlutils.unescape_for_display(url,
266
 
                                                    'utf-8')
 
261
            'utf-8')
267
262
        out, err = self.run_bzr(['upgrade', '--format=2a', url])
268
263
        backup_dir = 'backup.bzr.~1~'
269
264
        self.assertEqualDiff("""Upgrading branch %s ...
281
276
 
282
277
    def test_recommend_upgrade_wt4(self):
283
278
        # using a deprecated format gives a warning
284
 
        self.run_bzr('init --format=knit a')
 
279
        self.run_bzr('init --knit a')
285
280
        out, err = self.run_bzr('status a')
286
281
        self.assertContainsRe(err, 'brz upgrade .*[/\\\\]a')
287
282
 
289
284
        # we should only get a recommendation to upgrade when we're accessing
290
285
        # the actual workingtree, not when we only open a bzrdir that contains
291
286
        # an old workngtree
292
 
        self.run_bzr('init --format=knit a')
 
287
        self.run_bzr('init --knit a')
293
288
        out, err = self.run_bzr('revno a')
294
289
        if err.find('upgrade') > -1:
295
290
            self.fail("message shouldn't suggest upgrade:\n%s" % err)