diff options
| author | dpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-15 21:01:50 +0000 |
|---|---|---|
| committer | dpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-15 21:01:50 +0000 |
| commit | 0039dfb6b94e1138b7f99a53da311b1bf5a56da3 (patch) | |
| tree | 1cffc8071aae5c7a59ec422026c7cb5647355af0 /webkit/tools/layout_tests | |
| parent | 7a01ffa50af11c9565e269e8ce7aad7e373ce266 (diff) | |
| download | chromium_src-0039dfb6b94e1138b7f99a53da311b1bf5a56da3.zip chromium_src-0039dfb6b94e1138b7f99a53da311b1bf5a56da3.tar.gz chromium_src-0039dfb6b94e1138b7f99a53da311b1bf5a56da3.tar.bz2 | |
Fix bug 30408, 30380
30408 - parsing of timing information for slow and/or timedout tests was
broken.
30380 - parsing of the # skipped in test results broke on the buildbot. I've
changed the text here slightly but this also requires a separate change on
the buildbot master.
R=ojan@chromium.org
TEST=none
BUG=30408
BUG=30380
Review URL: http://codereview.chromium.org/503010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34603 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/layout_tests')
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/test_expectations.py | 6 | ||||
| -rwxr-xr-x | webkit/tools/layout_tests/run_webkit_tests.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/webkit/tools/layout_tests/layout_package/test_expectations.py b/webkit/tools/layout_tests/layout_package/test_expectations.py index a8e0cec..55ecc1c 100644 --- a/webkit/tools/layout_tests/layout_package/test_expectations.py +++ b/webkit/tools/layout_tests/layout_package/test_expectations.py @@ -173,7 +173,7 @@ class TestExpectationsFile: 'crash': CRASH, 'missing': MISSING } - EXPECTATION_DESCRIPTIONS = { SKIP : ('Skipped', 'Skipped'), + EXPECTATION_DESCRIPTIONS = { SKIP : ('skipped', 'skipped'), PASS : ('passes', 'passes'), FAIL : ('failure', 'failures'), TEXT : ('text diff mismatch', @@ -184,8 +184,8 @@ class TestExpectationsFile: CRASH : ('test shell crash', 'test shell crashes'), TIMEOUT : ('test timed out', 'tests timed out'), - MISSING : ('No expected result found', - 'No expected results found') } + MISSING : ('no expected result found', + 'no expected results found') } EXPECTATION_ORDER = ( PASS, CRASH, TIMEOUT, MISSING, IMAGE_PLUS_TEXT, TEXT, IMAGE, FAIL, SKIP ) diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py index 10915f7..4f600b8 100755 --- a/webkit/tools/layout_tests/run_webkit_tests.py +++ b/webkit/tools/layout_tests/run_webkit_tests.py @@ -960,7 +960,7 @@ class TestRunner: slow_tests.append(test_tuple) if filename in result_summary.failures: - result = result_summary.failures[filename] + result = result_summary.results[filename] if (result == test_expectations.TIMEOUT or result == test_expectations.CRASH): is_timeout_crash_or_slow = True |