← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transport.py

  • Committer: John Arbash Meinel
  • Date: 2006-10-16 01:25:46 UTC
  • mfrom: (2071 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2080.
  • Revision ID: john@arbash-meinel.com-20061016012546-d01a0740671b4d73
[merge] bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transport.py
100
100
        finally:
101
101
            _set_protocol_handlers(saved_handlers)
102
102
 
 
103
    def test__combine_paths(self):
 
104
        t = Transport('/')
 
105
        self.assertEqual('/home/sarah/project/foo',
 
106
                         t._combine_paths('/home/sarah', 'project/foo'))
 
107
        self.assertEqual('/etc',
 
108
                         t._combine_paths('/home/sarah', '../../etc'))
 
109
 
103
110
 
104
111
class TestCoalesceOffsets(TestCase):
105
112
    
415
422
        base_url = self._server.get_url()
416
423
        # try getting the transport via the regular interface:
417
424
        t = get_transport(base_url)
418
 
        if not isinstance(t, self.transport_class): 
 
425
        if not isinstance(t, self.transport_class):
419
426
            # we did not get the correct transport class type. Override the
420
427
            # regular connection behaviour by direct construction.
421
428
            t = self.transport_class(base_url)