Commit 5d592968 authored by Guido van Rossum's avatar Guido van Rossum

Provide a timeout option on pollUp/pollDown, defaulting to 30 seconds.

parent a1b5aae2
...@@ -279,15 +279,25 @@ class ConnectionTests(StorageTestBase.StorageTestBase): ...@@ -279,15 +279,25 @@ class ConnectionTests(StorageTestBase.StorageTestBase):
pass pass
self.__super_tearDown() self.__super_tearDown()
def pollUp(self): def pollUp(self, timeout=30.0):
# Poll until we're connected # Poll until we're connected
now = time.time()
giveup = now + timeout
while not self._storage.is_connected(): while not self._storage.is_connected():
asyncore.poll(0.1) asyncore.poll(0.1)
now = time.time()
if now > giveup:
self.fail("timed out waiting for storage to connect")
def pollDown(self): def pollDown(self, timeout=30.0):
# Poll until we're disconnected # Poll until we're disconnected
now = time.time()
giveup = now + timeout
while self._storage.is_connected(): while self._storage.is_connected():
asyncore.poll(0.1) asyncore.poll(0.1)
now = time.time()
if now > giveup:
self.fail("timed out waiting for storage to disconnect")
def checkMultipleAddresses(self): def checkMultipleAddresses(self):
for i in range(4): for i in range(4):
......
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