/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart_transport.py

Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart_transport.py
41
41
        SmartClientHTTPMediumRequest,
42
42
        SmartRequestHandler,
43
43
        )
44
 
from bzrlib.transport.smart import medium, protocol, vfs
 
44
from bzrlib.transport.smart import (
 
45
        medium,
 
46
        protocol,
 
47
        server,
 
48
        vfs,
 
49
)
45
50
 
46
51
 
47
52
class StringIOSSHVendor(object):
521
526
        # the default or a parameterized class, but rather use the
522
527
        # TestCaseWithTransport infrastructure to set up a smart server and
523
528
        # transport.
524
 
        self.transport_server = smart.SmartTCPServer_for_testing
 
529
        self.transport_server = server.SmartTCPServer_for_testing
525
530
 
526
531
    def test_plausible_url(self):
527
532
        self.assert_(self.get_url().startswith('bzr://'))
778
783
        class FlakyTransport(object):
779
784
            def get_bytes(self, path):
780
785
                raise Exception("some random exception from inside server")
781
 
        server = smart.SmartTCPServer(backing_transport=FlakyTransport())
782
 
        server.start_background_thread()
 
786
        smart_server = server.SmartTCPServer(backing_transport=FlakyTransport())
 
787
        smart_server.start_background_thread()
783
788
        try:
784
 
            transport = smart.SmartTCPTransport(server.get_url())
 
789
            transport = smart.SmartTCPTransport(smart_server.get_url())
785
790
            try:
786
791
                transport.get('something')
787
792
            except errors.TransportError, e:
789
794
            else:
790
795
                self.fail("get did not raise expected error")
791
796
        finally:
792
 
            server.stop_background_thread()
 
797
            smart_server.stop_background_thread()
793
798
 
794
799
 
795
800
class SmartTCPTests(tests.TestCase):
810
815
        if readonly:
811
816
            self.real_backing_transport = self.backing_transport
812
817
            self.backing_transport = get_transport("readonly+" + self.backing_transport.abspath('.'))
813
 
        self.server = smart.SmartTCPServer(self.backing_transport)
 
818
        self.server = server.SmartTCPServer(self.backing_transport)
814
819
        self.server.start_background_thread()
815
820
        self.transport = smart.SmartTCPTransport(self.server.get_url())
816
821