Unreviewed. Update Selenium WebDriver imported tests.
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 18 Jan 2018 10:11:12 +0000 (10:11 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 18 Jan 2018 10:11:12 +0000 (10:11 +0000)
* imported/selenium/importer.json:
* imported/selenium/py/test/selenium/webdriver/common/executing_async_javascript_tests.py:
(reset_timeouts):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@227138 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebDriverTests/ChangeLog
WebDriverTests/imported/selenium/importer.json
WebDriverTests/imported/selenium/py/test/selenium/webdriver/common/executing_async_javascript_tests.py

index 41a582a..2178409 100644 (file)
@@ -1,3 +1,11 @@
+2018-01-18  Carlos Garcia Campos  <cgarcia@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  <cgarcia@igalia.com>
 
         WebDriver: ignore the driver in selenium test names when getting expectations
index 7d28500..96a2a7f 100644 (file)
@@ -1,6 +1,6 @@
 {
     "repository": "https://github.com/SeleniumHQ/selenium.git",
-    "revision": "c5e4a585f1e3c4b3468ec93ab50d3668d47aef1b",
+    "revision": "569520625c9719e2f3e8669b638981e0c690a7d8",
     "paths_to_import": [
         "common",
         "py/conftest.py",
index 76fb0a3..f84b36d 100644 (file)
@@ -23,6 +23,13 @@ from selenium.common.exceptions import TimeoutException
 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);")