/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/ftp_server/pyftpdlib_based.py

  • Committer: John Arbash Meinel
  • Date: 2011-04-20 09:46:28 UTC
  • mfrom: (5609.33.4 2.3)
  • mto: (5609.33.5 2.3)
  • mto: This revision was merged to the branch mainline in revision 5811.
  • Revision ID: john@arbash-meinel.com-20110420094628-l0bafq1lwb6ib1v2
Merge lp:bzr/2.3 @ 5640 so we can update the release notes (aka NEWS)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/ftp_server/pyftpdlib_based.py
28
28
 
29
29
from bzrlib import (
30
30
    osutils,
 
31
    tests,
31
32
    trace,
32
 
    transport,
33
33
    )
 
34
from bzrlib.tests import test_server
34
35
 
35
36
 
36
37
class AnonymousWithWriteAccessAuthorizer(ftpserver.DummyAuthorizer):
133
134
        self.addr = self.socket.getsockname()
134
135
 
135
136
 
136
 
class FTPTestServer(transport.Server):
 
137
class FTPTestServer(test_server.TestServer):
137
138
    """Common code for FTP server facilities."""
138
139
 
139
140
    def __init__(self):
158
159
        self.logs.append(message)
159
160
 
160
161
    def start_server(self, vfs_server=None):
161
 
        from bzrlib.transport.local import LocalURLServer
162
 
        if not (vfs_server is None or isinstance(vfs_server, LocalURLServer)):
 
162
        if not (vfs_server is None or isinstance(vfs_server,
 
163
                                                 test_server.LocalURLServer)):
163
164
            raise AssertionError(
164
165
                "FTPServer currently assumes local transport, got %s"
165
166
                % vfs_server)
183
184
        self._ftpd_starting.acquire() # So it can be released by the server
184
185
        self._ftpd_thread = threading.Thread(target=self._run_server,)
185
186
        self._ftpd_thread.start()
 
187
        if 'threads' in tests.selftest_debug_flags:
 
188
            sys.stderr.write('Thread started: %s\n'
 
189
                             % (self._ftpd_thread.ident,))
186
190
        # Wait for the server thread to start (i.e release the lock)
187
191
        self._ftpd_starting.acquire()
188
192
        self._ftpd_starting.release()
195
199
        self._ftp_server.close()
196
200
        self._ftpd_running = False
197
201
        self._ftpd_thread.join()
 
202
        if 'threads' in tests.selftest_debug_flags:
 
203
            sys.stderr.write('Thread  joined: %s\n'
 
204
                             % (self._ftpd_thread.ident,))
198
205
 
199
206
    def _run_server(self):
200
207
        """Run the server until stop_server is called, shut it down properly then.