diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | chrome/test/webdriver/WEBDRIVER_TESTS | 23 | ||||
| -rwxr-xr-x | chrome/test/webdriver/chromedriver_tests.py | 16 | ||||
| -rw-r--r-- | chrome/test/webdriver/run_webdriver_tests.py | 2 |
4 files changed, 12 insertions, 31 deletions
@@ -169,7 +169,7 @@ deps = { "/trunk/deps/third_party/swig/Lib@" + Var("swig_revision"), "src/third_party/webdriver/python": - "http://selenium.googlecode.com/svn/trunk/py@11167", + "http://selenium.googlecode.com/svn/trunk/py@11673", "src/third_party/libvpx": "/trunk/deps/third_party/libvpx@" + diff --git a/chrome/test/webdriver/WEBDRIVER_TESTS b/chrome/test/webdriver/WEBDRIVER_TESTS index 3e94cb1..db254da 100644 --- a/chrome/test/webdriver/WEBDRIVER_TESTS +++ b/chrome/test/webdriver/WEBDRIVER_TESTS @@ -31,26 +31,10 @@ # 'executing_async_javascript_test', 'executing_javascript_test', 'form_handling_tests', - # The following require the click command. - '-form_handling_tests.FormHandlingTests.testClickingOnUnclickableElementsDoesNothing', - '-form_handling_tests.FormHandlingTests.testShouldBeAbleToClickImageButtons', - '-form_handling_tests.FormHandlingTests.testShouldBeAbleToSelectARadioButtonByClickingOnIt', + # This test is flaky, probably because of form submission race. '-form_handling_tests.FormHandlingTests.testShouldClickOnSubmitInputElements', - # The following are all suppressed because the submit command currently does - # not wait for post-submit navigation events to complete. - '-form_handling_tests.FormHandlingTests.testShouldBeAbleToSubmitForms', - '-form_handling_tests.FormHandlingTests.testShouldSubmitAFormWhenAnyElementWihinThatFormIsSubmitted', - '-form_handling_tests.FormHandlingTests.testShouldSubmitAFormWhenAnyInputElementWithinThatFormIsSubmitted', - # Test fails from a bug in the WebDriver python bindings. This bug has been - # fixed in the WebDriver tree: - # http://code.google.com/p/selenium/source/detail?r=11480 - '-form_handling_tests.FormHandlingTests.testShouldThrowAnExceptionWhenSelectingAnUnselectableElement', 'frame_switching_tests', 'implicit_waits_tests', - # Depends on click. - '-implicit_waits_tests.ImplicitWaitTest.testShouldImplicitlyWaitForASingleElement', - '-implicit_waits_tests.ImplicitWaitTest.testShouldImplicitlyWaitUntilAtLeastOneElementIsFoundWhenSearchingForMany', - '-implicit_waits_tests.ImplicitWaitTest.testShouldReturnAfterFirstAttemptToFindManyAfterDisablingImplicitWaits', 'page_loading_tests', # testShouldReturnWhenGettingAUrlThatDoesNotResolve causes the test after # to fail when run in xvfb: crbug.com/72027. @@ -69,13 +53,10 @@ '-rendered_webelement_tests.RenderedWebElementTests.testShouldPickUpStyleOfAnElement', 'select_element_handling_tests', 'stale_reference_tests', - # Test requires click command. - '-stale_reference_tests.StaleReferenceTests.testOldPage', # 'text_handling_tests', 'typing_tests', 'visibility_tests', - # Depends on click. - '-visibility_tests.VisibilityTests.testShouldModifyTheVisibilityOfAnElementDynamically', + # Bug in clicking: element is not verified before clicking. '-visibility_tests.VisibilityTests.testShouldNotBeAbleToClickOnAnElementThatIsNotDisplayed', # Bug in typing: element is not verified before typing. '-visibility_tests.VisibilityTests.testShouldNotBeAbleToTypeAnElementThatIsNotDisplayed', diff --git a/chrome/test/webdriver/chromedriver_tests.py b/chrome/test/webdriver/chromedriver_tests.py index d324b2c..55a7bd3 100755 --- a/chrome/test/webdriver/chromedriver_tests.py +++ b/chrome/test/webdriver/chromedriver_tests.py @@ -111,7 +111,7 @@ class BasicTest(unittest.TestCase): def testCanStartChromeDriverOnSpecificPort(self): launcher = ChromeDriverLauncher(port=9520) self.assertEquals(9520, launcher.GetPort()) - driver = WebDriver(launcher.GetURL(), 'chrome', 'any') + driver = WebDriver(launcher.GetURL(), {}) driver.quit() launcher.Kill() @@ -123,7 +123,7 @@ class CookieTest(unittest.TestCase): def setUp(self): self._launcher = ChromeDriverLauncher() - self._driver = WebDriver(self._launcher.GetURL(), 'chrome', 'any') + self._driver = WebDriver(self._launcher.GetURL(), {}) def tearDown(self): self._driver.quit() @@ -174,7 +174,7 @@ class SessionTest(unittest.TestCase): self.assertEquals(data['sessionId'], url_parts[2]) def testShouldBeGivenCapabilitiesWhenStartingASession(self): - driver = WebDriver(self._launcher.GetURL(), 'chrome', 'any') + driver = WebDriver(self._launcher.GetURL(), {}) capabilities = driver.capabilities self.assertEquals('chrome', capabilities['browserName']) @@ -201,16 +201,16 @@ class SessionTest(unittest.TestCase): driver.quit() def testSessionCreationDeletion(self): - driver = WebDriver(self._launcher.GetURL(), 'chrome', 'any') + driver = WebDriver(self._launcher.GetURL(), {}) driver.quit() def testMultipleSessionCreationDeletion(self): for i in range(10): - driver = WebDriver(self._launcher.GetURL(), 'chrome', 'any') + driver = WebDriver(self._launcher.GetURL(), {}) driver.quit() def testSessionCommandsAfterSessionDeletionReturn404(self): - driver = WebDriver(self._launcher.GetURL(), 'chrome', 'any') + driver = WebDriver(self._launcher.GetURL(), {}) session_id = driver.session_id driver.quit() try: @@ -223,7 +223,7 @@ class SessionTest(unittest.TestCase): def testMultipleConcurrentSessions(self): drivers = [] for i in range(10): - drivers += [WebDriver(self._launcher.GetURL(), 'chrome', 'any')] + drivers += [WebDriver(self._launcher.GetURL(), {})] for driver in drivers: driver.quit() @@ -233,7 +233,7 @@ class MouseTest(unittest.TestCase): def setUp(self): self._launcher = ChromeDriverLauncher(root_path=os.path.dirname(__file__)) - self._driver = WebDriver(self._launcher.GetURL(), 'chrome', 'any') + self._driver = WebDriver(self._launcher.GetURL(), {}) def tearDown(self): self._driver.quit() diff --git a/chrome/test/webdriver/run_webdriver_tests.py b/chrome/test/webdriver/run_webdriver_tests.py index bd43942..7d556b4 100644 --- a/chrome/test/webdriver/run_webdriver_tests.py +++ b/chrome/test/webdriver/run_webdriver_tests.py @@ -251,7 +251,7 @@ class Main(object): # properties. launcher = ChromeDriverLauncher(self._options.driver_exe, chromedriver_paths.WEBDRIVER_TEST_DATA) - driver = WebDriver(launcher.GetURL(), 'chrome', 'any') + driver = WebDriver(launcher.GetURL(), {}) # The tests expect a webserver. Since ChromeDriver also operates as one, # just pass this dummy class with the right info. class DummyWebserver: |