/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-05-21 19:09:26 UTC
  • mfrom: (6622.1.36 breezy)
  • Revision ID: jelmer@jelmer.uk-20170521190926-5vtz8xaf0e9ylrpc
Merge rename to breezy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_upgrade.py
18
18
import os
19
19
import stat
20
20
 
21
 
from bzrlib import (
 
21
from breezy import (
22
22
    bzrdir,
23
23
    controldir,
24
24
    lockable_files,
25
25
    ui,
26
26
    urlutils,
27
27
    )
28
 
from bzrlib.tests import (
 
28
from breezy.tests import (
29
29
    features,
30
30
    TestCaseWithTransport,
31
31
    )
32
 
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
33
 
from bzrlib.repofmt.knitpack_repo import RepositoryFormatKnitPack1
 
32
from breezy.tests.test_sftp_transport import TestCaseWithSFTPServer
 
33
from breezy.repofmt.knitpack_repo import RepositoryFormatKnitPack1
34
34
 
35
35
 
36
36
class OldBzrDir(bzrdir.BzrDirMeta1):
37
 
    """An test bzr dir implementation"""
 
37
    """An test brz dir implementation"""
38
38
 
39
39
    def needs_format_conversion(self, format):
40
40
        return not isinstance(format, self.__class__)
83
83
        (out, err) = self.run_bzr(
84
84
            ['upgrade', self.get_readonly_url("old_format_branch")], retcode=3)
85
85
        err_msg = 'Upgrade URL cannot work with readonly URLs.'
86
 
        self.assertEqualDiff('conversion error: %s\nbzr: ERROR: %s\n'
 
86
        self.assertEqualDiff('conversion error: %s\nbrz: ERROR: %s\n'
87
87
                             % (err_msg, err_msg),
88
88
                             err)
89
89
 
230
230
        display_url = t.local_abspath('.')
231
231
        backup_dir1 = 'backup.bzr.~1~'
232
232
        backup_dir2 = 'backup.bzr.~2~'
233
 
        # explicitly create backup_dir1. bzr should create the .~2~ directory
 
233
        # explicitly create backup_dir1. brz should create the .~2~ directory
234
234
        # as backup
235
235
        t.mkdir(backup_dir1)
236
236
        (out, err) = self.run_bzr(
278
278
        # using a deprecated format gives a warning
279
279
        self.run_bzr('init --knit a')
280
280
        out, err = self.run_bzr('status a')
281
 
        self.assertContainsRe(err, 'bzr upgrade .*[/\\\\]a')
 
281
        self.assertContainsRe(err, 'brz upgrade .*[/\\\\]a')
282
282
 
283
283
    def test_no_upgrade_recommendation_from_bzrdir(self):
284
284
        # we should only get a recommendation to upgrade when we're accessing