Title: [226820] trunk/Tools
- Revision
- 226820
- Author
- [email protected]
- Date
- 2018-01-11 16:23:55 -0800 (Thu, 11 Jan 2018)
Log Message
webkitpy: Fix flakey webserver tests
https://bugs.webkit.org/show_bug.cgi?id=181555
<rdar://problem/36448273>
Reviewed by Aakash Jain.
* Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py:
(LayoutTestRunnerTests.test_servers_started): Add and bind custom checks to
determine if a specific server is running.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (226819 => 226820)
--- trunk/Tools/ChangeLog 2018-01-12 00:19:51 UTC (rev 226819)
+++ trunk/Tools/ChangeLog 2018-01-12 00:23:55 UTC (rev 226820)
@@ -1,5 +1,17 @@
2018-01-11 Jonathan Bedard <[email protected]>
+ webkitpy: Fix flakey webserver tests
+ https://bugs.webkit.org/show_bug.cgi?id=181555
+ <rdar://problem/36448273>
+
+ Reviewed by Aakash Jain.
+
+ * Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py:
+ (LayoutTestRunnerTests.test_servers_started): Add and bind custom checks to
+ determine if a specific server is running.
+
+2018-01-11 Jonathan Bedard <[email protected]>
+
Commit queue failed to land a bug, 'NoneType' object has no attribute 'strip'
https://bugs.webkit.org/show_bug.cgi?id=181561
<rdar://problem/36452652>
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py (226819 => 226820)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py 2018-01-12 00:19:51 UTC (rev 226819)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py 2018-01-12 00:23:55 UTC (rev 226820)
@@ -159,6 +159,15 @@
def stop_web_platform_test_server():
self.web_platform_test_server_stopped = True
+ def is_http_server_running():
+ return self.http_started and not self.http_stopped
+
+ def is_websocket_servers_running():
+ return self.websocket_started and not self.websocket_stopped
+
+ def is_wpt_server_running():
+ return self.websocket_started and not self.web_platform_test_server_stopped
+
host = MockHost()
port = host.port_factory.get('test-mac-leopard')
port.start_http_server = start_http_server
@@ -167,6 +176,9 @@
port.stop_http_server = stop_http_server
port.stop_websocket_server = stop_websocket_server
port.stop_web_platform_test_server = stop_web_platform_test_server
+ port.is_http_server_running = is_http_server_running
+ port.is_websocket_servers_running = is_websocket_servers_running
+ port.is_wpt_server_running = is_wpt_server_running
self.http_started = self.http_stopped = self.websocket_started = self.websocket_stopped = False
self.web_platform_test_server_started = self.web_platform_test_server_stopped = False
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
