/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

  • Committer: Andrew Bennetts
  • Date: 2007-04-06 01:19:30 UTC
  • mto: This revision was merged to the branch mainline in revision 2402.
  • Revision ID: andrew.bennetts@canonical.com-20070406011930-wy4emdgu3yu527pm
Move SmartTCPServer classes into bzrlib/smart/server.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart_transport.py
30
30
        tests,
31
31
        urlutils,
32
32
        )
 
33
from bzrlib.smart import server
33
34
from bzrlib.tests.HTTPTestUtil import (
34
35
        HTTPServerWithSmarts,
35
36
        SmartRequestHandler,
521
522
        # the default or a parameterized class, but rather use the
522
523
        # TestCaseWithTransport infrastructure to set up a smart server and
523
524
        # transport.
524
 
        self.transport_server = smart.SmartTCPServer_for_testing
 
525
        self.transport_server = server.SmartTCPServer_for_testing
525
526
 
526
527
    def test_plausible_url(self):
527
528
        self.assert_(self.get_url().startswith('bzr://'))
774
775
        class FlakyTransport(object):
775
776
            def get_bytes(self, path):
776
777
                raise Exception("some random exception from inside server")
777
 
        server = smart.SmartTCPServer(backing_transport=FlakyTransport())
778
 
        server.start_background_thread()
 
778
        smart_server = server.SmartTCPServer(backing_transport=FlakyTransport())
 
779
        smart_server.start_background_thread()
779
780
        try:
780
 
            transport = smart.SmartTCPTransport(server.get_url())
 
781
            transport = smart.SmartTCPTransport(smart_server.get_url())
781
782
            try:
782
783
                transport.get('something')
783
784
            except errors.TransportError, e:
785
786
            else:
786
787
                self.fail("get did not raise expected error")
787
788
        finally:
788
 
            server.stop_background_thread()
 
789
            smart_server.stop_background_thread()
789
790
 
790
791
 
791
792
class SmartTCPTests(tests.TestCase):
806
807
        if readonly:
807
808
            self.real_backing_transport = self.backing_transport
808
809
            self.backing_transport = get_transport("readonly+" + self.backing_transport.abspath('.'))
809
 
        self.server = smart.SmartTCPServer(self.backing_transport)
 
810
        self.server = server.SmartTCPServer(self.backing_transport)
810
811
        self.server.start_background_thread()
811
812
        self.transport = smart.SmartTCPTransport(self.server.get_url())
812
813