~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transport.py

Merge Goffredo's urlspec help patch and tweak the NEWS entries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
34
34
from bzrlib.tests import TestCase, TestCaseInTempDir
35
35
from bzrlib.transport import (_CoalescedOffset,
36
36
                              _get_protocol_handlers,
 
37
                              _set_protocol_handlers,
37
38
                              _get_transport_modules,
38
39
                              get_transport,
39
 
                              _protocol_handlers,
40
40
                              register_lazy_transport,
41
 
                              _set_protocol_handlers,
 
41
                              register_transport_proto,
 
42
                              _clear_protocol_handlers,
42
43
                              Transport,
43
44
                              )
44
45
from bzrlib.transport.chroot import ChrootServer
55
56
 
56
57
    def test__get_set_protocol_handlers(self):
57
58
        handlers = _get_protocol_handlers()
58
 
        self.assertNotEqual({}, handlers)
 
59
        self.assertNotEqual([], handlers.keys( ))
59
60
        try:
60
 
            _set_protocol_handlers({})
61
 
            self.assertEqual({}, _get_protocol_handlers())
 
61
            _clear_protocol_handlers()
 
62
            self.assertEqual([], _get_protocol_handlers().keys())
62
63
        finally:
63
64
            _set_protocol_handlers(handlers)
64
65
 
67
68
        class SampleHandler(object):
68
69
            """I exist, isnt that enough?"""
69
70
        try:
70
 
            my_handlers = {}
71
 
            _set_protocol_handlers(my_handlers)
 
71
            _clear_protocol_handlers()
 
72
            register_transport_proto('foo')
72
73
            register_lazy_transport('foo', 'bzrlib.tests.test_transport', 'TestTransport.SampleHandler')
 
74
            register_transport_proto('bar')
73
75
            register_lazy_transport('bar', 'bzrlib.tests.test_transport', 'TestTransport.SampleHandler')
74
76
            self.assertEqual([SampleHandler.__module__, 'bzrlib.transport.chroot'],
75
77
                             _get_transport_modules())
80
82
        """Transport with missing dependency causes no error"""
81
83
        saved_handlers = _get_protocol_handlers()
82
84
        try:
 
85
            register_transport_proto('foo')
83
86
            register_lazy_transport('foo', 'bzrlib.tests.test_transport',
84
87
                    'BadTransportHandler')
85
88
            try:
100
103
        """Transport with missing dependency causes no error"""
101
104
        saved_handlers = _get_protocol_handlers()
102
105
        try:
103
 
            _set_protocol_handlers({})
 
106
            _clear_protocol_handlers()
 
107
            register_transport_proto('foo')
104
108
            register_lazy_transport('foo', 'bzrlib.tests.test_transport',
105
109
                    'BackupTransportHandler')
106
110
            register_lazy_transport('foo', 'bzrlib.tests.test_transport',
361
365
        backing_transport = MemoryTransport()
362
366
        server = ChrootServer(backing_transport)
363
367
        server.setUp()
364
 
        self.assertTrue(server.scheme in _protocol_handlers.keys())
 
368
        self.assertTrue(server.scheme in _get_protocol_handlers().keys())
365
369
 
366
370
    def test_tearDown(self):
367
371
        backing_transport = MemoryTransport()
368
372
        server = ChrootServer(backing_transport)
369
373
        server.setUp()
370
374
        server.tearDown()
371
 
        self.assertFalse(server.scheme in _protocol_handlers.keys())
 
375
        self.assertFalse(server.scheme in _get_protocol_handlers().keys())
372
376
 
373
377
    def test_get_url(self):
374
378
        backing_transport = MemoryTransport()