| Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/server_base.py
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/server_base.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/server_base.py
|
| index 3cb58de8e57bdfb21ff63bb945816ac20f52ff79..e970975153e938ebff936d5cd8bcfbabb562f856 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/server_base.py
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/server_base.py
|
| @@ -82,7 +82,8 @@ class ServerBase(object):
|
| def start(self):
|
| """Starts the server. It is an error to start an already started server.
|
|
|
| - This method also stops any stale servers started by a previous instance."""
|
| + This method also stops any stale servers started by a previous instance.
|
| + """
|
| assert not self._pid, '%s server is already running' % self._name
|
|
|
| # Stop any stale servers left over from previous instances.
|
| @@ -146,13 +147,15 @@ class ServerBase(object):
|
|
|
| def _prepare_config(self):
|
| """This routine can be overridden by subclasses to do any sort
|
| - of initialization required prior to starting the server that may fail."""
|
| + of initialization required prior to starting the server that may fail.
|
| + """
|
|
|
| def _remove_stale_logs(self):
|
| """This routine can be overridden by subclasses to try and remove logs
|
| left over from a prior run. This routine should log warnings if the
|
| files cannot be deleted, but should not fail unless failure to
|
| - delete the logs will actually cause start() to fail."""
|
| + delete the logs will actually cause start() to fail.
|
| + """
|
| # Sometimes logs are open in other processes but they should clear eventually.
|
| for log_prefix in self._log_prefixes:
|
| try:
|
| @@ -227,7 +230,8 @@ class ServerBase(object):
|
|
|
| def _wait_for_action(self, action, wait_secs=20.0, sleep_secs=1.0):
|
| """Repeat the action for wait_sec or until it succeeds, sleeping for sleep_secs
|
| - in between each attempt. Returns whether it succeeded."""
|
| + in between each attempt. Returns whether it succeeded.
|
| + """
|
| start_time = time.time()
|
| while time.time() - start_time < wait_secs:
|
| if action():
|
|
|