Disable pid check in apache startup on win32.

Disable pid check in apache startup on win32.

This is testing a theory that maybe we are not reliably computing
the pid the apache server is running as on win7, and we are getting
confused over whether the server is running. If this theory is correct,
we should either see the hangs go away, or get some sort of different errors
that might help to debug things.

TBR=eseidel@chromium.org
BUG=378444
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=178964

[Dirk Pranke, 2014-07-25 20:52:45]

The CQ bit was checked by dpranke@chromium.org

[commit-bot: I haz the power, 2014-07-25 20:53:38]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/dpranke@chromium.org/416243006/1

[commit-bot: I haz the power, 2014-07-25 20:53:49]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-07-25 20:53:50]

Failed to apply patch for
Tools/Scripts/webkitpy/layout_tests/servers/server_base.py:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Tools/Scripts/webkitpy/layout_tests/servers/server_base.py
  Hunk #4 FAILED at 201.
  Hunk #5 succeeded at 266 (offset 36 lines).
  1 out of 5 hunks FAILED -- saving rejects to file
Tools/Scripts/webkitpy/layout_tests/servers/server_base.py.rej

Patch:       Tools/Scripts/webkitpy/layout_tests/servers/server_base.py
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
5b7f34121a3e97bd77be4ab41029ef3aad2ccd93..dc89c023b0eedd8be7895ee67e3395462fe9829a
100644
--- a/Tools/Scripts/webkitpy/layout_tests/servers/server_base.py
+++ b/Tools/Scripts/webkitpy/layout_tests/servers/server_base.py
@@ -31,7 +31,6 @@
 import errno
 import logging
 import socket
-import sys
 import tempfile
 import time
 
@@ -50,6 +49,7 @@ class ServerBase(object):
         self._port_obj = port_obj
         self._executive = port_obj._executive
         self._filesystem = port_obj._filesystem
+        self._platform = port_obj.host.platform
         self._output_dir = output_dir
 
         # We need a non-checkout-dependent place to put lock files, etc. We
@@ -57,7 +57,7 @@ class ServerBase(object):
         # randomly-generated directory under /var/folders and no one would ever
         # look there.
         tmpdir = tempfile.gettempdir()
-        if port_obj.host.platform.is_mac():
+        if self._platform.is_mac():
             tmpdir = '/tmp'
 
         self._runtime_path = self._filesystem.join(tmpdir, "WebKit")
@@ -201,7 +201,9 @@ class ServerBase(object):
 
     def _is_server_running_on_all_ports(self):
         """Returns whether the server is running on all the desired ports."""
-        if not self._executive.check_running_pid(self._pid):
+
+        # TODO(dpranke): crbug/378444 maybe pid is unreliable on win?
+        if not self._platform.is_win() and not
self._executive.check_running_pid(self._pid):
             _log.debug("Server isn't running at all")
             raise ServerError("Server exited")
 
@@ -230,7 +232,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 sys.platform == 'win32' 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

[Dirk Pranke, 2014-07-25 20:57:36]

The CQ bit was checked by dpranke@chromium.org

[commit-bot: I haz the power, 2014-07-25 20:58:29]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/dpranke@chromium.org/416243006/20001

[eseidel, 2014-07-25 21:05:40]

lgtm

[commit-bot: I haz the power, 2014-07-25 22:00:43]

Change committed as 178964