← 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

Merge bzr.dev.

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 import urlutils
23
24
 
24
25
 
25
26
class FooService(object):
83
84
        branch = self.make_branch('.')
84
85
        self.assertEqual(branch.base, directories.dereference(':this'))
85
86
 
 
87
    def test_extra_path(self):
 
88
        branch = self.make_branch('.')
 
89
        self.assertEqual(urlutils.join(branch.base, 'arg'),
 
90
                         directories.dereference(':this/arg'))
 
91
 
86
92
    def test_lookup_badname(self):
87
93
        branch = self.make_branch('.')
88
94
        e = self.assertRaises(errors.InvalidLocationAlias,