autoupdate_EndToEndTest: Increase devserver launch timeout.
The autoupdate_EndToEndTest launches a private instance of the
devserver.py in the same devserver, listening in a different port.
The test waits for 15 seconds until the new devserver.py writes its
pid and port number to some temp files. Under heavy load, this value
could be too small.
This patch increases the timeout to 30 seconds and improves the log
message description to include the timeout and the devserver load.
BUG=chromium:370302
TEST=python linter.
Change-Id: I934a6eb926143ccaae2b3bae67d1282361defd2b
Reviewed-on: https://chromium-review.googlesource.com/217081
Reviewed-by: Prashanth B <beeps@chromium.org>
Commit-Queue: Alex Deymo <deymo@chromium.org>
Tested-by: Alex Deymo <deymo@chromium.org>
diff --git a/server/site_tests/autoupdate_EndToEndTest/autoupdate_EndToEndTest.py b/server/site_tests/autoupdate_EndToEndTest/autoupdate_EndToEndTest.py
index 8db2d6a..16a1e57 100755
--- a/server/site_tests/autoupdate_EndToEndTest/autoupdate_EndToEndTest.py
+++ b/server/site_tests/autoupdate_EndToEndTest/autoupdate_EndToEndTest.py
@@ -340,7 +340,7 @@
class OmahaDevserver(object):
"""Spawns a test-private devserver instance."""
# How long to wait for a devserver to start.
- _WAIT_FOR_DEVSERVER_STARTED_SECONDS = 15
+ _WAIT_FOR_DEVSERVER_STARTED_SECONDS = 30
# How long to sleep (seconds) between checks to see if a devserver is up.
_WAIT_SLEEP_INTERVAL = 1
@@ -454,10 +454,15 @@
except Exception: # Couldn't read file or corrupt content.
time.sleep(self._WAIT_SLEEP_INTERVAL)
else:
+ try:
+ self._devserver_ssh.run_output('uptime')
+ except error.AutoservRunError as e:
+ logging.debug('Failed to run uptime on the devserver: %s', e)
raise OmahaDevserverFailedToStart(
'The test failed to find the pid/port of the omaha '
- 'devserver. Check the dumped devserver logs for more '
- 'information.')
+ 'devserver after %d seconds. Check the dumped devserver '
+ 'logs and devserver load for more information.' %
+ self._WAIT_FOR_DEVSERVER_STARTED_SECONDS)
# Check that the server is reponsding to network requests.
logging.warning('Waiting for devserver to accept network requests.')