← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2006-06-20 07:55:43 UTC
  • mfrom: (1798 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1799.
  • Revision ID: mbp@sourcefrog.net-20060620075543-b10f6575d4a4fa32
[merge] bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_bound_branches.py
21
21
import os
22
22
from cStringIO import StringIO
23
23
 
24
 
from bzrlib.tests import TestCaseWithTransport
25
24
from bzrlib.branch import Branch
26
25
from bzrlib.bzrdir import (BzrDir, BzrDirFormat, BzrDirMetaFormat1)
27
26
from bzrlib.osutils import getcwd
 
27
from bzrlib.tests import TestCaseWithTransport
 
28
import bzrlib.urlutils as urlutils
28
29
from bzrlib.workingtree import WorkingTree
29
30
 
30
31
 
41
42
        # bind on a format 6 bzrdir should error
42
43
        out,err = self.run_bzr('bind', '../master', retcode=3)
43
44
        self.assertEqual('', out)
 
45
        # TODO: jam 20060427 Probably something like this really should
 
46
        #       print out the actual path, rather than the URL
 
47
        cwd = urlutils.local_path_to_url(getcwd())
44
48
        self.assertEqual('bzr: ERROR: To use this feature you must '
45
 
                         'upgrade your branch at %s/.\n' % getcwd(), err)
 
49
                         'upgrade your branch at %s/.\n' % cwd, err)
46
50
    
47
51
    def test_unbind_format_6_bzrdir(self):
48
52
        # bind on a format 6 bzrdir should error
49
53
        out,err = self.run_bzr('unbind', retcode=3)
50
54
        self.assertEqual('', out)
 
55
        cwd = urlutils.local_path_to_url(getcwd())
51
56
        self.assertEqual('bzr: ERROR: To use this feature you must '
52
 
                         'upgrade your branch at %s/.\n' % getcwd(), err)
 
57
                         'upgrade your branch at %s/.\n' % cwd, err)
53
58
 
54
59
 
55
60
class TestBoundBranches(TestCaseWithTransport):