Title: [266460] trunk/Tools
- Revision
- 266460
- Author
- pvol...@apple.com
- Date
- 2020-09-02 08:32:44 -0700 (Wed, 02 Sep 2020)
Log Message
[Win] The WPT server is not always starting when running layout tests
https://bugs.webkit.org/show_bug.cgi?id=216035
Reviewed by Youenn Fablet.
The Web platform test server is not always starting when running layout tests using Cygwin. It seems that starting the WPT server
takes longer time on Windows. Currently, the timeout is set to 20 seconds with polling every second. This patch addresses this
issue by waiting up to 60 seconds with polling every 10th second.
* Scripts/webkitpy/layout_tests/servers/http_server_base.py:
(HttpServerBase.start):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (266459 => 266460)
--- trunk/Tools/ChangeLog 2020-09-02 15:30:46 UTC (rev 266459)
+++ trunk/Tools/ChangeLog 2020-09-02 15:32:44 UTC (rev 266460)
@@ -1,3 +1,17 @@
+2020-09-02 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] The WPT server is not always starting when running layout tests
+ https://bugs.webkit.org/show_bug.cgi?id=216035
+
+ Reviewed by Youenn Fablet.
+
+ The Web platform test server is not always starting when running layout tests using Cygwin. It seems that starting the WPT server
+ takes longer time on Windows. Currently, the timeout is set to 20 seconds with polling every second. This patch addresses this
+ issue by waiting up to 60 seconds with polling every 10th second.
+
+ * Scripts/webkitpy/layout_tests/servers/http_server_base.py:
+ (HttpServerBase.start):
+
2020-09-02 Diego Pino Garcia <dp...@igalia.com>
Unreviewed. Follow-up r266450, fix script due to missing variable.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base.py (266459 => 266460)
--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base.py 2020-09-02 15:30:46 UTC (rev 266459)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base.py 2020-09-02 15:32:44 UTC (rev 266460)
@@ -97,7 +97,13 @@
self._pid = self._spawn_process()
- if self._wait_for_action(self._is_server_running_on_all_ports):
+ if sys.platform == 'cygwin':
+ # Starting the server takes longer time on Cygwin
+ server_started = self._wait_for_action(self._is_server_running_on_all_ports, 60, 10)
+ else:
+ server_started = self._wait_for_action(self._is_server_running_on_all_ports)
+
+ if server_started:
_log.debug("%s successfully started (pid = %d)" % (self._name, self._pid))
else:
self._stop_running_server()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
