← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/server.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:
bzrlib/smart/server.py
279
279
        self.root_client_path = self.client_path_extra = client_path_extra
280
280
        self.start_background_thread(self.thread_name_suffix)
281
281
 
282
 
    def tearDown(self):
 
282
    def stop_server(self):
283
283
        self.stop_background_thread()
284
 
        self.chroot_server.tearDown()
 
284
        self.chroot_server.stop_server()
285
285
 
286
286
    def get_url(self):
287
287
        url = super(SmartTCPServer_for_testing, self).get_url()
387
387
        self.base_path = self.get_base_path(transport)
388
388
        chroot_server = chroot.ChrootServer(transport)
389
389
        chroot_server.setUp()
390
 
        self.cleanups.append(chroot_server.tearDown)
 
390
        self.cleanups.append(chroot_server.stop_server)
391
391
        transport = get_transport(chroot_server.get_url())
392
392
        if self.base_path is not None:
393
393
            # Decorate the server's backing transport with a filter that can
394
394
            # expand homedirs.
395
395
            expand_userdirs = self._make_expand_userdirs_filter(transport)
396
396
            expand_userdirs.setUp()
397
 
            self.cleanups.append(expand_userdirs.tearDown)
 
397
            self.cleanups.append(expand_userdirs.stop_server)
398
398
            transport = get_transport(expand_userdirs.get_url())
399
399
        self.transport = transport
400
400