Title: [244492] trunk/Tools
- Revision
- 244492
- Author
- bb...@apple.com
- Date
- 2019-04-21 12:48:46 -0700 (Sun, 21 Apr 2019)
Log Message
WebDriver: add hooks to make it possible to easily run WPT WebDriver web server by itself
https://bugs.webkit.org/show_bug.cgi?id=197125
<rdar://problem/50061468>
Reviewed by Darin Adler.
Sometimes I want to run wptserve independently of tests. Make it easier to script that
using this class rather than making our own ./wpt serve invocation.
* Scripts/webkitpy/webdriver_tests/webdriver_w3c_web_server.py:
(WebDriverW3CWebServer):
(WebDriverW3CWebServer.document_root): Expose this to clients.
(WebDriverW3CWebServer.wait): Add a method that blocks until the server dies.
(WebDriverW3CWebServer.__enter__):
(WebDriverW3CWebServer.__exit__):
Make it possible to use the web server with a 'with' statement.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (244491 => 244492)
--- trunk/Tools/ChangeLog 2019-04-21 00:03:44 UTC (rev 244491)
+++ trunk/Tools/ChangeLog 2019-04-21 19:48:46 UTC (rev 244492)
@@ -1,3 +1,23 @@
+2019-04-21 Brian Burg <bb...@apple.com>
+
+ WebDriver: add hooks to make it possible to easily run WPT WebDriver web server by itself
+ https://bugs.webkit.org/show_bug.cgi?id=197125
+ <rdar://problem/50061468>
+
+ Reviewed by Darin Adler.
+
+ Sometimes I want to run wptserve independently of tests. Make it easier to script that
+ using this class rather than making our own ./wpt serve invocation.
+
+ * Scripts/webkitpy/webdriver_tests/webdriver_w3c_web_server.py:
+ (WebDriverW3CWebServer):
+ (WebDriverW3CWebServer.document_root): Expose this to clients.
+ (WebDriverW3CWebServer.wait): Add a method that blocks until the server dies.
+
+ (WebDriverW3CWebServer.__enter__):
+ (WebDriverW3CWebServer.__exit__):
+ Make it possible to use the web server with a 'with' statement.
+
2019-04-20 Don Olmstead <don.olmst...@sony.com>
[CMake][Win] Use target oriented design for WebKitLegacy
Modified: trunk/Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_web_server.py (244491 => 244492)
--- trunk/Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_web_server.py 2019-04-21 00:03:44 UTC (rev 244491)
+++ trunk/Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_web_server.py 2019-04-21 19:48:46 UTC (rev 244492)
@@ -131,3 +131,23 @@
def port(self):
return self._server_port
+
+ def document_root(self):
+ return self._layout_doc_root
+
+ # Waits indefinitely until the webserver process is terminated.
+ def wait(self):
+ if not self._pid:
+ return
+
+ self._process.wait()
+
+ def __enter__(self):
+ if not self._pid:
+ self.start()
+
+ return self
+
+ def __exit__(self, exc_type, exc_value, exc_traceback):
+ if self._pid:
+ self.stop()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
