Commit 85721ab8 authored by Jim Fulton's avatar Jim Fulton

Move wait up to client-runner, because it doesn't depend on ClientThread.

parent 6f7a54d3
...@@ -760,6 +760,11 @@ class ClientRunner: ...@@ -760,6 +760,11 @@ class ClientRunner:
# addrs aren't used until the client disconnects.xs # addrs aren't used until the client disconnects.xs
self.client.addrs = addrs self.client.addrs = addrs
def wait(self, timeout=None):
if timeout is None:
timeout = self.timeout
self.wait_for_result(self.client.connected, timeout)
class ClientThread(ClientRunner): class ClientThread(ClientRunner):
"""Thread wrapper for client interface """Thread wrapper for client interface
...@@ -805,11 +810,6 @@ class ClientThread(ClientRunner): ...@@ -805,11 +810,6 @@ class ClientThread(ClientRunner):
loop.close() loop.close()
logger.debug('Stopping client thread') logger.debug('Stopping client thread')
def wait(self, timeout=None):
if timeout is None:
timeout = self.timeout
self.wait_for_result(self.client.connected, timeout)
closed = False closed = False
def close(self): def close(self):
if not self.closed: if not self.closed:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment