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 16d1dd20e0dfac11f14ef7102ec73ce7d9e67b8e..5f195f033b2c97884443febb555d482b57506e40 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 |
@@ -25,7 +25,6 @@ |
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
- |
"""Base class used to start servers used by the layout tests.""" |
import errno |
@@ -34,7 +33,6 @@ import socket |
import tempfile |
import time |
- |
_log = logging.getLogger(__name__) |
@@ -129,8 +127,7 @@ class ServerBase(object): |
_log.warning('Failed to stop %s: pid file is missing' % self._name) |
return |
if self._pid != actual_pid: |
- _log.warning('Failed to stop %s: pid file contains %d, not %d' % |
- (self._name, actual_pid, self._pid)) |
+ _log.warning('Failed to stop %s: pid file contains %d, not %d' % (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 |
@@ -274,7 +271,7 @@ class ServerBase(object): |
except IOError, 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 |
+ elif self._platform.is_win() and e.errno in (errno.WSAEACCES, ): # pylint: disable=E1101 |
raise ServerError('Port %d is already in use.' % port) |
else: |
raise |