From 0ca83807909cb9ab68786a102ce5700903a84883 Mon Sep 17 00:00:00 2001
From: "dalecurtis@google.com"
 <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 8 Aug 2012 23:58:24 +0000
Subject: Don't count SLOW tests towards failure.

Also adds 2 tests which weren't being counted:
http/tests/security/video-cross-origin-readback.html
http/tests/security/video-poster-cross-origin-crash.html

BUG=140583
TEST=Ran layout test analyzer.

Review URL: https://chromiumcodereview.appspot.com/10823238

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150639 0039d316-1c4b-4281-b951-d872f2087c98
---
 media/tools/layout_tests/layouttest_analyzer_helpers.py | 4 ++++
 media/tools/layout_tests/testname/media.csv             | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'media/tools')

diff --git a/media/tools/layout_tests/layouttest_analyzer_helpers.py b/media/tools/layout_tests/layouttest_analyzer_helpers.py
index 7a133d0..300775c 100644
--- a/media/tools/layout_tests/layouttest_analyzer_helpers.py
+++ b/media/tools/layout_tests/layouttest_analyzer_helpers.py
@@ -63,6 +63,10 @@ class AnalyzerResultMap:
       for (k, value) in test_info_map.iteritems():
         self.result_map['whole'][k] = value
         if 'te_info' in value:
+          # Don't count SLOW PASS tests as failures.
+          if any([True for x in value['te_info'] if set(x.keys()) ==
+                 set(['SLOW', 'PASS', 'Bugs', 'Comments'])]):
+            continue
           if any([True for x in value['te_info'] if 'SKIP' in x]):
             self.result_map['skip'][k] = value
           else:
diff --git a/media/tools/layout_tests/testname/media.csv b/media/tools/layout_tests/testname/media.csv
index 90da82b..264e7aa 100644
--- a/media/tools/layout_tests/testname/media.csv
+++ b/media/tools/layout_tests/testname/media.csv
@@ -19,8 +19,8 @@ fast/layers/video-layer.html,
 http/tests/appcache/video.html,
 http/tests/canvas/webgl/origin-clean-conformance.html,
 http/tests/media/,
-http/tests/security/\S+video\S+.html,
+http/tests/security/\S*video\S+.html,
 http/tests/security/contentSecurityPolicy/media-src-allowed.html,
 http/tests/security/contentSecurityPolicy/media-src-blocked.html,
 media/,
-platform/chromium/media/,
\ No newline at end of file
+platform/chromium/media/,
-- 
cgit v1.1