~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart_transport.py

  • Committer: Martin Pool
  • Date: 2010-01-06 04:48:59 UTC
  • mto: This revision was merged to the branch mainline in revision 4943.
  • Revision ID: mbp@sourcefrog.net-20100106044859-s8gwd12nev9p7nws
Rename Server.tearDown to .stop_server

Show diffs side-by-side

added added

removed removed

Lines of Context:
1001
1001
        if not backing_transport:
1002
1002
            mem_server = memory.MemoryServer()
1003
1003
            mem_server.setUp()
1004
 
            self.addCleanup(mem_server.tearDown)
 
1004
            self.addCleanup(mem_server.stop_server)
1005
1005
            self.permit_url(mem_server.get_url())
1006
1006
            self.backing_transport = get_transport(mem_server.get_url())
1007
1007
        else:
1021
1021
            del self.transport
1022
1022
        if getattr(self, 'server', None):
1023
1023
            self.server.stop_background_thread()
 
1024
            # XXX: why not .stop_server() -- mbp 20100106
1024
1025
            del self.server
1025
1026
 
1026
1027