← 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: John Arbash Meinel
  • Date: 2006-05-02 20:46:11 UTC
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: john@arbash-meinel.com-20060502204611-02caa5c20fb84ef8
Moved url functions into bzrlib.urlutils

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,
27
26
                           BzrDirFormat,
28
27
                           BzrDirFormat6,
29
28
                           BzrDirMetaFormat1,
30
29
                           )
31
 
from bzrlib.osutils import getcwd, local_path_to_url
 
30
from bzrlib.osutils import getcwd
 
31
from bzrlib.tests import TestCaseWithTransport
 
32
import bzrlib.urlutils as urlutils
32
33
from bzrlib.workingtree import WorkingTree
33
34
 
34
35
 
52
53
        self.assertEqual('', out)
53
54
        # TODO: jam 20060427 Probably something like this really should
54
55
        #       print out the actual path, rather than the URL
55
 
        cwd = local_path_to_url(getcwd())
 
56
        cwd = urlutils.local_path_to_url(getcwd())
56
57
        self.assertEqual('bzr: ERROR: To use this feature you must '
57
58
                         'upgrade your branch at %s/.\n' % cwd, err)
58
59
    
60
61
        # bind on a format 6 bzrdir should error
61
62
        out,err = self.run_bzr('unbind', retcode=3)
62
63
        self.assertEqual('', out)
63
 
        cwd = local_path_to_url(getcwd())
 
64
        cwd = urlutils.local_path_to_url(getcwd())
64
65
        self.assertEqual('bzr: ERROR: To use this feature you must '
65
66
                         'upgrade your branch at %s/.\n' % cwd, err)
66
67