← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/ftp_server/pyftpdlib_based.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/tests/ftp_server/pyftpdlib_based.py
186
186
        self._ftpd_starting.acquire()
187
187
        self._ftpd_starting.release()
188
188
 
189
 
    def tearDown(self):
190
 
        """See bzrlib.transport.Server.tearDown."""
 
189
    def stop_server(self):
 
190
        """See bzrlib.transport.Server.stop_server."""
191
191
        # Tell the server to stop, but also close the server socket for tests
192
192
        # that start the server but never initiate a connection. Closing the
193
193
        # socket should be done first though, to avoid further connections.
196
196
        self._ftpd_thread.join()
197
197
 
198
198
    def _run_server(self):
199
 
        """Run the server until tearDown is called, shut it down properly then.
 
199
        """Run the server until stop_server is called, shut it down properly then.
200
200
        """
201
201
        self._ftpd_running = True
202
202
        self._ftpd_starting.release()