Changeset 244492 in webkit

Timestamp:

Apr 21, 2019 12:48:46 PM (5 years ago)

Author:

BJ Burg

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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/webdriver_tests/webdriver_w3c_web_server.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-04-21  Brian Burg  <bburg@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.olmstead@sony.com>
 

trunk/Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_web_server.py

@@ -132 +132 @@
     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()