return output.getvalue()
-def expect_state_changes(test, listener, process, states, timeout=5):
+def expect_state_changes(test, listener, process, states, timeout=30):
"""Listens for state changed events on the listener and makes sure they match what we
expect. Stop-and-restart events (where GetRestartedFromEvent() returns true) are ignored."""
try:
# accept() is stubborn and won't fail even when the socket is
# shutdown, so we'll use a timeout
- self._socket.settimeout(20.0)
+ self._socket.settimeout(30.0)
client, client_addr = self._socket.accept()
self._client = client
# The connected client inherits its timeout from self._socket,