Commit 548376a3 authored by craigdh@chromium.org's avatar craigdh@chromium.org

[chromedriver] Disable some failing tests on Android and fix glob testname matching.

BUG=None
TEST=Tests run.

Review URL: https://codereview.chromium.org/14328023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195022 0039d316-1c4b-4281-b951-d872f2087c98
parent b7fc3bf2
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
It is evaluated through Python. It is evaluated through Python.
""" """
import fnmatch
_REVISION_NEGATIVE_FILTER = {} _REVISION_NEGATIVE_FILTER = {}
_REVISION_NEGATIVE_FILTER['HEAD'] = [ _REVISION_NEGATIVE_FILTER['HEAD'] = [
'AlertsTest.*', 'AlertsTest.*',
...@@ -131,10 +134,22 @@ _OS_NEGATIVE_FILTER['android'] = [ ...@@ -131,10 +134,22 @@ _OS_NEGATIVE_FILTER['android'] = [
'ElementSelectingTest.testShouldBeAbleToToggleEnabledMultiSelectOption', 'ElementSelectingTest.testShouldBeAbleToToggleEnabledMultiSelectOption',
'ExecutingAsyncJavascriptTest.shouldBeAbleToExecuteAsynchronousScripts', 'ExecutingAsyncJavascriptTest.shouldBeAbleToExecuteAsynchronousScripts',
'ExecutingAsyncJavascriptTest.shouldNotTimeoutIfScriptCallsbackInsideAZeroTimeout', 'ExecutingAsyncJavascriptTest.shouldNotTimeoutIfScriptCallsbackInsideAZeroTimeout',
'FormHandlingTest.testSendingKeyboardEventsShouldAppendTextInInputs',
'FormHandlingTest.testSendingKeyboardEventsShouldAppendTextInInputsWithExistingValue',
'FormHandlingTest.testSendingKeyboardEventsShouldAppendTextinTextAreas',
'FormHandlingTest.testSendKeysKeepsCapitalization',
'FormHandlingTest.testShouldBeAbleToClearTextFromInputElements',
'FormHandlingTest.testShouldBeAbleToClearTextFromTextAreas',
'FormHandlingTest.testShouldBeAbleToEnterTextIntoATextAreaBySettingItsValue',
'FormHandlingTest.testShouldEnterDataIntoFormFields',
'FrameSwitchingTest.testClosingTheFinalBrowserWindowShouldNotCauseAnExceptionToBeThrown', 'FrameSwitchingTest.testClosingTheFinalBrowserWindowShouldNotCauseAnExceptionToBeThrown',
'FrameSwitchingTest.testGetCurrentUrl', 'FrameSwitchingTest.testGetCurrentUrl',
'FrameSwitchingTest.testShouldNotSwitchMagicallyToTheTopWindow',
'I18nTest.testEnteringHebrewTextFromLeftToRight', 'I18nTest.testEnteringHebrewTextFromLeftToRight',
'I18nTest.testEnteringHebrewTextFromRightToLeft', 'I18nTest.testEnteringHebrewTextFromRightToLeft',
'I18nTest.testShouldBeAbleToInputJapanese',
'ImplicitWaitTest.testShouldImplicitlyWaitForAnElementToBeVisibleBeforeInteracting',
'JavascriptEnabledDriverTest.testChangeEventIsFiredAppropriatelyWhenFocusIsLost',
'JavascriptEnabledDriverTest.testIssue80ClickShouldGenerateClickEvent', 'JavascriptEnabledDriverTest.testIssue80ClickShouldGenerateClickEvent',
'JavascriptEnabledDriverTest.testShouldBeAbleToClickALinkThatClosesAWindow', 'JavascriptEnabledDriverTest.testShouldBeAbleToClickALinkThatClosesAWindow',
'JavascriptEnabledDriverTest.testShouldFireOnChangeEventWhenSettingAnElementsValue', 'JavascriptEnabledDriverTest.testShouldFireOnChangeEventWhenSettingAnElementsValue',
...@@ -146,6 +161,8 @@ _OS_NEGATIVE_FILTER['android'] = [ ...@@ -146,6 +161,8 @@ _OS_NEGATIVE_FILTER['android'] = [
'TakesScreenshotTest.testCaptureToBase64', 'TakesScreenshotTest.testCaptureToBase64',
'TakesScreenshotTest.testSaveScreenshotAsFile', 'TakesScreenshotTest.testSaveScreenshotAsFile',
'TextHandlingTest.testShouldBeAbleToEnterDatesAfterFillingInOtherValuesFirst', 'TextHandlingTest.testShouldBeAbleToEnterDatesAfterFillingInOtherValuesFirst',
'TextHandlingTest.testShouldBeAbleToSetMoreThanOneLineOfTextInATextArea',
'TextHandlingTest.testTextOfATextAreaShouldBeEqualToItsDefaultTextEvenAfterTyping',
'TouchFlickTest.*', 'TouchFlickTest.*',
'TouchScrollTest.*', 'TouchScrollTest.*',
'TouchSingleTapTest.*', 'TouchSingleTapTest.*',
...@@ -185,10 +202,5 @@ def ApplyJavaTestFilter(operating_system, chrome_version, tests): ...@@ -185,10 +202,5 @@ def ApplyJavaTestFilter(operating_system, chrome_version, tests):
_REVISION_NEGATIVE_FILTER[chrome_version]) _REVISION_NEGATIVE_FILTER[chrome_version])
passed = set(tests) passed = set(tests)
for f in filters: for f in filters:
passed.difference_update(set(t for t in tests if _TestMatchesFilter(t, f))) passed.difference_update(set(t for t in tests if fnmatch.fnmatch(t, f)))
return passed return passed
def _TestMatchesFilter(test, filter):
if '*' in filter:
return test[:len(filter) - 1] == test[:-1]
return test == filter
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment