Title: [227268] trunk/Tools
- Revision
- 227268
- Author
- bb...@apple.com
- Date
- 2018-01-20 00:42:08 -0800 (Sat, 20 Jan 2018)
Log Message
WebDriver: fix some nits that prevent running W3C tests on Mac
https://bugs.webkit.org/show_bug.cgi?id=181864
Reviewed by Carlos Garcia Campos.
* Scripts/webkitpy/webdriver_tests/webdriver_w3c_web_server.py:
(WebDriverW3CWebServer.__init__): _wsout needs to always be defined,
as we assume that the property exists later.
(WebDriverW3CWebServer.stop): If the temporary file doesn't
exist for some reason, the remove call will raise and exception.
Gracefully handle the case where the file isn't created due to
a problem/exception that happened elsewhere.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (227267 => 227268)
--- trunk/Tools/ChangeLog 2018-01-20 07:45:32 UTC (rev 227267)
+++ trunk/Tools/ChangeLog 2018-01-20 08:42:08 UTC (rev 227268)
@@ -1,3 +1,19 @@
+2018-01-20 Brian Burg <bb...@apple.com>
+
+ WebDriver: fix some nits that prevent running W3C tests on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=181864
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Scripts/webkitpy/webdriver_tests/webdriver_w3c_web_server.py:
+ (WebDriverW3CWebServer.__init__): _wsout needs to always be defined,
+ as we assume that the property exists later.
+
+ (WebDriverW3CWebServer.stop): If the temporary file doesn't
+ exist for some reason, the remove call will raise and exception.
+ Gracefully handle the case where the file isn't created due to
+ a problem/exception that happened elsewhere.
+
2018-01-19 Ling Ho <lingcherd...@apple.com>
Move Bingdings EWS and Webkitpy EWS queues to High Sierra on buildbot dashboard.
Modified: trunk/Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_web_server.py (227267 => 227268)
--- trunk/Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_web_server.py 2018-01-20 07:45:32 UTC (rev 227267)
+++ trunk/Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_web_server.py 2018-01-20 08:42:08 UTC (rev 227268)
@@ -43,6 +43,7 @@
self._layout_doc_root = os.path.join(layout_root, 'imported', 'w3c', 'web-platform-tests')
self._process = None
self._pid = None
+ self._wsout = None
tmpdir = tempfile.gettempdir()
if self._port.host.platform.is_mac():
@@ -114,7 +115,9 @@
def stop(self):
_log.debug('Cleaning WebDriver WPT server config.json')
- self._port.host.filesystem.remove(os.path.join(self._layout_doc_root, 'config.json'))
+ temporary_config_file = os.path.join(self._layout_doc_root, 'config.json')
+ if self._port.host.filesystem.exists(temporary_config_file):
+ self._port.host.filesystem.remove(temporary_config_file)
if self._process:
self._process.communicate(input='\n')
if self._wsout:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
