/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/plugins/weave_fmt/test_bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-24 01:39:33 UTC
  • mfrom: (3815.3776.6)
  • Revision ID: jelmer@jelmer.uk-20170524013933-ir4y4tqtrsiz2ka2
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
24
24
import os
25
25
import sys
26
26
 
27
 
from bzrlib import (
 
27
from ... import (
28
28
    branch,
29
29
    bzrdir,
30
30
    controldir,
34
34
    urlutils,
35
35
    workingtree,
36
36
    )
37
 
from bzrlib.osutils import (
 
37
from ...osutils import (
38
38
    getcwd,
39
39
    )
40
 
from bzrlib.tests.test_bundle import V4BundleTester
41
 
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
42
 
from bzrlib.tests import (
 
40
from ...tests.test_bundle import V4BundleTester
 
41
from ...tests.test_sftp_transport import TestCaseWithSFTPServer
 
42
from ...tests import (
43
43
    TestCaseWithTransport,
44
44
    )
45
45
 
46
 
from bzrlib.plugins.weave_fmt.branch import (
 
46
from .branch import (
47
47
    BzrBranchFormat4,
48
48
    )
49
 
from bzrlib.plugins.weave_fmt.bzrdir import (
 
49
from .bzrdir import (
50
50
    BzrDirFormat5,
51
51
    BzrDirFormat6,
52
52
    )
555
555
        # TODO: jam 20060427 Probably something like this really should
556
556
        #       print out the actual path, rather than the URL
557
557
        cwd = urlutils.local_path_to_url(getcwd())
558
 
        self.assertEqual('bzr: ERROR: To use this feature you must '
 
558
        self.assertEqual('brz: ERROR: To use this feature you must '
559
559
                         'upgrade your branch at %s/.\n' % cwd, err)
560
560
 
561
561
    def test_unbind_format_6_bzrdir(self):
563
563
        out,err = self.run_bzr('unbind', retcode=3)
564
564
        self.assertEqual('', out)
565
565
        cwd = urlutils.local_path_to_url(getcwd())
566
 
        self.assertEqual('bzr: ERROR: To use this feature you must '
 
566
        self.assertEqual('brz: ERROR: To use this feature you must '
567
567
                         'upgrade your branch at %s/.\n' % cwd, err)
568
568
 
569
569