diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-24 11:30:15 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-30 12:56:19 +0000 |
| commit | 6036726eb981b6c4b42047513b9d3f4ac865daac (patch) | |
| tree | 673593e70678e7789766d1f732eb51f613a2703b /chromium/third_party/blink/tools/blinkpy/web_tests/servers/apache_http.py | |
| parent | 466052c4e7c052268fd931888cd58961da94c586 (diff) | |
| download | qtwebengine-chromium-6036726eb981b6c4b42047513b9d3f4ac865daac.tar.gz | |
BASELINE: Update Chromium to 70.0.3538.78
Change-Id: Ie634710bf039e26c1957f4ae45e101bd4c434ae7
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/blink/tools/blinkpy/web_tests/servers/apache_http.py')
| -rw-r--r-- | chromium/third_party/blink/tools/blinkpy/web_tests/servers/apache_http.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chromium/third_party/blink/tools/blinkpy/web_tests/servers/apache_http.py b/chromium/third_party/blink/tools/blinkpy/web_tests/servers/apache_http.py index 9f96f043469..991ae4ab03c 100644 --- a/chromium/third_party/blink/tools/blinkpy/web_tests/servers/apache_http.py +++ b/chromium/third_party/blink/tools/blinkpy/web_tests/servers/apache_http.py @@ -179,12 +179,11 @@ class ApacheHTTP(server_base.ServerBase): proc = self._executive.popen([self._port_obj.path_to_apache(), '-f', self._port_obj.path_to_apache_config_file(), '-c', 'PidFile "%s"' % self._pid_file, - '-k', 'stop'], stderr=self._executive.PIPE) - proc.wait() + '-k', 'stop']) + _, err = proc.communicate() retval = proc.returncode - err = proc.stderr.read() - if retval or len(err): - raise server_base.ServerError('Failed to stop %s: %s' % (self._name, err)) + if retval or (err and len(err)): + raise server_base.ServerError('Failed to stop %s: %s %s' % (self._name, err)) # For some reason apache isn't guaranteed to have actually stopped after # the stop command returns, so we wait a little while longer for the |