Title: [269787] trunk/Tools
- Revision
- 269787
- Author
- [email protected]
- Date
- 2020-11-13 13:09:06 -0800 (Fri, 13 Nov 2020)
Log Message
REGRESSION: r269514 Reset server port before restarting webserver
https://bugs.webkit.org/show_bug.cgi?id=218918
<rdar://problem/71380345>
Reviewed by Stephanie Lewis.
* Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py:
(SimpleHTTPServerDriver.serve): Reset server port.
(SimpleHTTPServerDriver.kill_server): Ditto.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (269786 => 269787)
--- trunk/Tools/ChangeLog 2020-11-13 18:22:32 UTC (rev 269786)
+++ trunk/Tools/ChangeLog 2020-11-13 21:09:06 UTC (rev 269787)
@@ -1,3 +1,15 @@
+2020-11-13 Jonathan Bedard <[email protected]>
+
+ REGRESSION: r269514 Reset server port before restarting webserver
+ https://bugs.webkit.org/show_bug.cgi?id=218918
+ <rdar://problem/71380345>
+
+ Reviewed by Stephanie Lewis.
+
+ * Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py:
+ (SimpleHTTPServerDriver.serve): Reset server port.
+ (SimpleHTTPServerDriver.kill_server): Ditto.
+
2020-11-13 Aakash Jain <[email protected]>
[build.webkit.org] Update RunAPITests step for new buildbot
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py (269786 => 269787)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py 2020-11-13 18:22:32 UTC (rev 269786)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py 2020-11-13 21:09:06 UTC (rev 269787)
@@ -32,6 +32,7 @@
interface_args = []
if self._ip:
interface_args.extend(['--interface', self._ip])
+ self._server_port = 0
self._server_process = subprocess.Popen(["python", http_server_path, web_root] + interface_args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
max_attempt = 5
interval = 0.5
@@ -86,6 +87,7 @@
def kill_server(self):
try:
+ self._server_port = 0
if not self._server_process:
return
if self._server_process.poll() is None:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
