Title: [227502] releases/WebKitGTK/webkit-2.18/WebDriverTests
- Revision
- 227502
- Author
- carlo...@webkit.org
- Date
- 2018-01-24 02:02:12 -0800 (Wed, 24 Jan 2018)
Log Message
Merge r227138 - Unreviewed. Update Selenium WebDriver imported tests.
* imported/selenium/importer.json:
* imported/selenium/py/test/selenium/webdriver/common/executing_async_javascript_tests.py:
(reset_timeouts):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/WebDriverTests/ChangeLog (227501 => 227502)
--- releases/WebKitGTK/webkit-2.18/WebDriverTests/ChangeLog 2018-01-24 10:02:06 UTC (rev 227501)
+++ releases/WebKitGTK/webkit-2.18/WebDriverTests/ChangeLog 2018-01-24 10:02:12 UTC (rev 227502)
@@ -1,3 +1,11 @@
+2018-01-18 Carlos Garcia Campos <cgar...@igalia.com>
+
+ Unreviewed. Update Selenium WebDriver imported tests.
+
+ * imported/selenium/importer.json:
+ * imported/selenium/py/test/selenium/webdriver/common/executing_async_javascript_tests.py:
+ (reset_timeouts):
+
2018-01-17 Carlos Garcia Campos <cgar...@igalia.com>
WebDriver: ignore the driver in selenium test names when getting expectations
Modified: releases/WebKitGTK/webkit-2.18/WebDriverTests/imported/selenium/importer.json (227501 => 227502)
--- releases/WebKitGTK/webkit-2.18/WebDriverTests/imported/selenium/importer.json 2018-01-24 10:02:06 UTC (rev 227501)
+++ releases/WebKitGTK/webkit-2.18/WebDriverTests/imported/selenium/importer.json 2018-01-24 10:02:12 UTC (rev 227502)
@@ -1,6 +1,6 @@
{
"repository": "https://github.com/SeleniumHQ/selenium.git",
- "revision": "c5e4a585f1e3c4b3468ec93ab50d3668d47aef1b",
+ "revision": "569520625c9719e2f3e8669b638981e0c690a7d8",
"paths_to_import": [
"common",
"py/conftest.py",
Modified: releases/WebKitGTK/webkit-2.18/WebDriverTests/imported/selenium/py/test/selenium/webdriver/common/executing_async_javascript_tests.py (227501 => 227502)
--- releases/WebKitGTK/webkit-2.18/WebDriverTests/imported/selenium/py/test/selenium/webdriver/common/executing_async_javascript_tests.py 2018-01-24 10:02:06 UTC (rev 227501)
+++ releases/WebKitGTK/webkit-2.18/WebDriverTests/imported/selenium/py/test/selenium/webdriver/common/executing_async_javascript_tests.py 2018-01-24 10:02:12 UTC (rev 227502)
@@ -23,6 +23,13 @@
from selenium.webdriver.remote.webelement import WebElement
+@pytest.fixture(autouse=True)
+def reset_timeouts(driver):
+ driver.set_script_timeout(0)
+ yield
+ driver.set_script_timeout(30)
+
+
def testShouldNotTimeoutIfCallbackInvokedImmediately(driver, pages):
pages.load("ajaxy_page.html")
result = driver.execute_async_script("arguments[arguments.length - 1](123);")
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
