Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(349)

Unified Diff: Tools/Scripts/webkitpy/layout_tests/servers/server_base.py

Issue 546133003: Reformat webkitpy.layout_tests w/ format-webkitpy. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Tools/Scripts/webkitpy/layout_tests/servers/server_base.py
diff --git a/Tools/Scripts/webkitpy/layout_tests/servers/server_base.py b/Tools/Scripts/webkitpy/layout_tests/servers/server_base.py
index 1d6a3e1138acf6b5700861b71c0977076879dba1..1746c81030ff66fb7512588866928d836f9a3e49 100644
--- a/Tools/Scripts/webkitpy/layout_tests/servers/server_base.py
+++ b/Tools/Scripts/webkitpy/layout_tests/servers/server_base.py
@@ -43,6 +43,7 @@ class ServerError(Exception):
class ServerBase(object):
+
"""A skeleton class for starting and stopping servers used by the layout tests."""
def __init__(self, port_obj, output_dir):
@@ -60,7 +61,7 @@ class ServerBase(object):
if self._platform.is_mac():
tmpdir = '/tmp'
- self._runtime_path = self._filesystem.join(tmpdir, "WebKit")
+ self._runtime_path = self._filesystem.join(tmpdir, 'WebKit')
self._filesystem.maybe_make_directory(self._runtime_path)
# Subclasses must override these fields.
@@ -102,7 +103,7 @@ class ServerBase(object):
self._pid = self._spawn_process()
if self._wait_for_action(self._is_server_running_on_all_ports):
- _log.debug("%s successfully started (pid = %d)" % (self._name, self._pid))
+ _log.debug('%s successfully started (pid = %d)' % (self._name, self._pid))
else:
self._log_errors_from_subprocess()
self._stop_running_server()
@@ -129,15 +130,15 @@ class ServerBase(object):
return
if self._pid != actual_pid:
_log.warning('Failed to stop %s: pid file contains %d, not %d' %
- (self._name, actual_pid, self._pid))
+ (self._name, actual_pid, self._pid))
# Try to kill the existing pid, anyway, in case it got orphaned.
self._executive.kill_process(self._pid)
self._pid = None
return
- _log.debug("Attempting to shut down %s server at pid %d" % (self._name, self._pid))
+ _log.debug('Attempting to shut down %s server at pid %d' % (self._name, self._pid))
self._stop_running_server()
- _log.debug("%s server at pid %d stopped" % (self._name, self._pid))
+ _log.debug('%s server at pid %d stopped' % (self._name, self._pid))
self._pid = None
finally:
# Make sure we delete the pid file no matter what happens.
@@ -157,7 +158,7 @@ class ServerBase(object):
for log_prefix in self._log_prefixes:
try:
self._remove_log_files(self._output_dir, log_prefix)
- except OSError, e:
+ except OSError as e:
_log.warning('Failed to remove old %s %s files' % (self._name, log_prefix))
def _spawn_process(self):
@@ -229,7 +230,7 @@ class ServerBase(object):
while time.time() - start_time < wait_secs:
if action():
return True
- _log.debug("Waiting for action: %s" % action)
+ _log.debug('Waiting for action: %s' % action)
time.sleep(sleep_secs)
return False
@@ -241,18 +242,18 @@ class ServerBase(object):
if not self._platform.is_win() and not self._executive.check_running_pid(self._pid):
_log.debug("Server isn't running at all")
self._log_errors_from_subprocess()
- raise ServerError("Server exited")
+ raise ServerError('Server exited')
for mapping in self._mappings:
s = socket.socket()
port = mapping['port']
try:
s.connect(('localhost', port))
- _log.debug("Server running on %d" % port)
- except IOError, e:
+ _log.debug('Server running on %d' % port)
+ except IOError as e:
if e.errno not in (errno.ECONNREFUSED, errno.ECONNRESET):
raise
- _log.debug("Server NOT running on %d: %s" % (port, e))
+ _log.debug('Server NOT running on %d: %s' % (port, e))
return False
finally:
s.close()
@@ -266,7 +267,7 @@ class ServerBase(object):
port = mapping['port']
try:
s.bind(('localhost', port))
- except IOError, e:
+ except IOError as e:
if e.errno in (errno.EALREADY, errno.EADDRINUSE):
raise ServerError('Port %d is already in use.' % port)
elif self._platform.is_win() and e.errno in (errno.WSAEACCES,): # pylint: disable=E1101

Powered by Google App Engine
This is Rietveld 408576698