summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-20 21:06:34 +0000
committersky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-20 21:06:34 +0000
commit4beb1521b481adfccda995ab1ffa4eb95ca85182 (patch)
treefac9d18f1c042a1a498c49d8040b3b27e346775e
parent4c2c1dbc004ac567b0b5af1e5b6ff87505d1f1af (diff)
downloadchromium_src-4beb1521b481adfccda995ab1ffa4eb95ca85182.zip
chromium_src-4beb1521b481adfccda995ab1ffa4eb95ca85182.tar.gz
chromium_src-4beb1521b481adfccda995ab1ffa4eb95ca85182.tar.bz2
DEFERs the test LayoutTests/http/tests/misc/dns-prefetch-control.html
as it can take too long to wrong. Removes the tests LayoutTests/transitions/transition-end-event-container.html LayoutTests/transitions/transition-end-event-multiple-03.html as I landed a fix (https://bugs.webkit.org/show_bug.cgi?id=24678) that should make these less flakey. BUG=none TEST=none Review URL: http://codereview.chromium.org/42462 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12212 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 4e4d816..31dd098e 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -932,10 +932,11 @@ LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-sub-frame-to-da
LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-to-data-url.html = FAIL
LayoutTests/http/tests/security/dataURL/xss-DENIED-to-data-url-from-data-url.html = FAIL
chrome/fast/dom/xss-DENIED-javascript-variations.html = FAIL
+// This test can end up taking longer than the amount of time we give
+// each test. DEFERd until we find a better way to deal with it.
+DEFER LINUX WIN : LayoutTests/http/tests/misc/dns-prefetch-control.html = TIMEOUT PASS
// This is failing on the mac debug only, not sure why, but it's pretty repeatable on the bots, so we
// go to the complexity to split out that one case to track any other changes for the other platforms.
-LINUX WIN : LayoutTests/http/tests/misc/dns-prefetch-control.html = TIMEOUT PASS
-MAC RELEASE : LayoutTests/http/tests/misc/dns-prefetch-control.html = TIMEOUT PASS
MAC DEBUG : LayoutTests/http/tests/misc/dns-prefetch-control.html = TIMEOUT FAIL PASS
// NEW FOR MERGE 37604:38097
@@ -1653,7 +1654,6 @@ WIN DEBUG : LayoutTests/fast/dom/jsDevicePixelRatio.html = CRASH
MAC : LayoutTests/http/tests/misc/submit-get-in-utf16be.html = CRASH PASS TIMEOUT
MAC : LayoutTests/animations/animation-controller-drt-api.html = TIMEOUT PASS
LINUX WIN DEBUG : LayoutTests/editing/selection/move-by-line-001.html = FAIL
-WIN : LayoutTests/transitions/transition-end-event-container.html = FAIL PASS
// New test added in the 41286:41362 merge. Not clear whether we pass.
// http://crbug.com/8404
@@ -1768,7 +1768,6 @@ MAC : LayoutTests/tables/mozilla/other/slashlogo.html = TIMEOUT PASS
MAC : LayoutTests/http/tests/xmlhttprequest/xml-encoding.html = TIMEOUT PASS
MAC : LayoutTests/http/tests/navigation/reload-subframe-iframe.html = TIMEOUT PASS
MAC : LayoutTests/http/tests/xmlhttprequest/encode-request-url.html = TIMEOUT PASS
-WIN DEBUG : LayoutTests/transitions/transition-end-event-multiple-03.html = FAIL PASS
WIN DEBUG : LayoutTests/fast/dom/HTMLElement/innerHTML-selection-crash.html = CRASH PASS
// Newly added test from 41613:41660