summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-06 19:59:21 +0000
committerdpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-06 19:59:21 +0000
commit3203c5e35bba5266fe1d149875c3a9815ee9c214 (patch)
tree42b55ecb3a564eb8039649bae99320d01da6be9b
parent19860f75acda02c670802c203ad7710c9fe4fe74 (diff)
downloadchromium_src-3203c5e35bba5266fe1d149875c3a9815ee9c214.zip
chromium_src-3203c5e35bba5266fe1d149875c3a9815ee9c214.tar.gz
chromium_src-3203c5e35bba5266fe1d149875c3a9815ee9c214.tar.bz2
Handle missing files more cleanly.
We weren't handling a missing .png's properly - they weren't getting reported as MISSING failures and the failure was basically getting swallowed. BUG=none TEST=none R=ojan@chromium.org Review URL: http://codereview.chromium.org/378016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31273 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/layout_tests/layout_package/compare_failures.py1
-rw-r--r--webkit/tools/layout_tests/test_types/image_diff.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/layout_package/compare_failures.py b/webkit/tools/layout_tests/layout_package/compare_failures.py
index 2e5dff3..d6e3dd0 100644
--- a/webkit/tools/layout_tests/layout_package/compare_failures.py
+++ b/webkit/tools/layout_tests/layout_package/compare_failures.py
@@ -48,6 +48,7 @@ class CompareFailures:
CRASH_TYPES = (test_failures.FailureCrash,)
HANG_TYPES = (test_failures.FailureTimeout,)
MISSING_TYPES = (test_failures.FailureMissingResult,
+ test_failures.FailureMissingImage,
test_failures.FailureMissingImageHash)
diff --git a/webkit/tools/layout_tests/test_types/image_diff.py b/webkit/tools/layout_tests/test_types/image_diff.py
index a14cb4c..055402b 100644
--- a/webkit/tools/layout_tests/test_types/image_diff.py
+++ b/webkit/tools/layout_tests/test_types/image_diff.py
@@ -138,6 +138,7 @@ class ImageDiff(test_type_base.TestTypeBase):
if not os.path.isfile(expected_png_file):
# Report a missing expected PNG file.
failures.append(test_failures.FailureMissingImage(self))
+ return failures
elif test_args.hash == expected_hash:
return failures