Chromium Code Reviews| Index: chrome/test/chromedriver/run_java_tests.py |
| diff --git a/chrome/test/chromedriver/run_java_tests.py b/chrome/test/chromedriver/run_java_tests.py |
| index 0d9e1ccc46618281a312db721baf5ab593dbba3c..5916185a0976d5d256ebf9915b1c97116158cdc6 100755 |
| --- a/chrome/test/chromedriver/run_java_tests.py |
| +++ b/chrome/test/chromedriver/run_java_tests.py |
| @@ -26,9 +26,26 @@ from continuous_archive import CHROME_26_REVISION |
| _THIS_DIR = os.path.abspath(os.path.dirname(__file__)) |
| -_FAILED_JAVA_TESTS_IN_CHROME_26 = [ |
| - 'UploadTest#testFileUploading', |
| - 'AlertsTest'] |
| +_DESKTOP_OS_SPECIFIC_FILTER = [] |
|
kkania
2013/03/25 20:45:10
the other two are called negative, which made me t
chrisgao (Use stgao instead)
2013/03/25 20:50:21
Done.
|
| +if util.IsLinux(): |
| + _DESKTOP_OS_SPECIFIC_FILTER = [ |
| + 'TypingTest#testArrowKeysAndPageUpAndDown', |
| + 'TypingTest#testHomeAndEndAndPageUpAndPageDownKeys', |
| + 'TypingTest#testNumberpadKeys', |
| + ] |
| + |
| +_DESKTOP_NEGATIVE_FILTER = {} |
| +_DESKTOP_NEGATIVE_FILTER['HEAD'] = ( |
| + _DESKTOP_OS_SPECIFIC_FILTER + [ |
| + 'ExecutingAsyncJavascriptTest#shouldNotTimeoutIfScriptCallsbackInsideAZeroTimeout', |
| + ] |
| +) |
| +_DESKTOP_NEGATIVE_FILTER[CHROME_26_REVISION] = ( |
| + _DESKTOP_NEGATIVE_FILTER['HEAD'] + [ |
| + 'UploadTest#testFileUploading', |
| + 'AlertsTest', |
| + ] |
| +) |
| class TestResult(object): |
| @@ -244,15 +261,14 @@ def main(): |
| test_filter = options.filter |
| if test_filter is None: |
| passed_java_tests = [] |
| + failed_tests = _DESKTOP_NEGATIVE_FILTER[options.chrome_revision] |
| with open(os.path.join(_THIS_DIR, 'passed_java_tests.txt'), 'r') as f: |
| for line in f: |
| java_test = line.strip('\n') |
| - # Filter out failed tests for chrome 26. |
| - if options.chrome_revision == CHROME_26_REVISION: |
| - suite_name = java_test.split('#')[0] |
| - if (java_test in _FAILED_JAVA_TESTS_IN_CHROME_26 or |
| - suite_name in _FAILED_JAVA_TESTS_IN_CHROME_26): |
| - continue |
| + # Filter out failed tests. |
| + suite_name = java_test.split('#')[0] |
| + if java_test in failed_tests or suite_name in failed_tests: |
| + continue |
| passed_java_tests.append(java_test) |
| test_filter = ','.join(passed_java_tests) |