← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_directory_service.py

  • Committer: Michael Hudson
  • Date: 2008-08-14 03:13:55 UTC
  • mto: (3714.2.1 bzr.ab.integration2)
  • mto: This revision was merged to the branch mainline in revision 3717.
  • Revision ID: michael.hudson@canonical.com-20080814031355-a0qts3o42dcxrleb
import urlutils and write urlutils.join rather than join

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_directory_service.py
20
20
from bzrlib.directory_service import DirectoryServiceRegistry, directories
21
21
from bzrlib.tests import TestCase, TestCaseWithTransport
22
22
from bzrlib.transport import get_transport
23
 
from bzrlib.urlutils import join
 
23
from bzrlib import urlutils
 
24
 
24
25
 
25
26
class FooService(object):
26
27
    """A directory service that maps the name to a FILE url"""
85
86
 
86
87
    def test_extra_path(self):
87
88
        branch = self.make_branch('.')
88
 
        self.assertEqual(
89
 
            join(branch.base, 'arg'), directories.dereference(':this/arg'))
 
89
        self.assertEqual(urlutils.join(branch.base, 'arg'),
 
90
                         directories.dereference(':this/arg'))
90
91
 
91
92
    def test_lookup_badname(self):
92
93
        branch = self.make_branch('.')