Chromium Code Reviews| Index: Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py |
| diff --git a/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py b/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py |
| index c28f4d56c0fabd32864b1cad463fde14a86e0806..183d61d5f4807893e4d822ba576ac7a1235ce211 100644 |
| --- a/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py |
| +++ b/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py |
| @@ -126,12 +126,10 @@ class ApacheHTTP(server_base.ServerBase): |
| def _spawn_process(self): |
| _log.debug('Starting %s server, cmd="%s"' % (self._name, str(self._start_cmd))) |
| - self._process = self._executive.popen(self._start_cmd, stderr=self._executive.PIPE) |
| - if self._process.returncode is not None: |
| - retval = self._process.returncode |
| - err = self._process.stderr.read() |
| - if retval or len(err): |
| - raise server_base.ServerError('Failed to start %s: %s' % (self._name, err)) |
| + self._process = self._executive.popen(self._start_cmd) |
| + retval = self._process.returncode |
| + if retval: |
| + raise server_base.ServerError('Failed to start %s: %s' % (self._name, retval)) |
|
Dirk Pranke
2014/11/11 16:31:53
This change worries me. I fairly strongly recall t
Kunihiko Sakamoto
2014/11/12 01:02:39
Got it. Let's try this for now.
|
| # For some reason apache isn't guaranteed to have created the pid file before |
| # the process exits, so we wait a little while longer. |