summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-12 23:12:17 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-12 23:12:17 +0000
commit59bbde10b721f5d8a22c800abfef4e180e752130 (patch)
tree83edd22d557a80146cf203a3f79d4392ec412ecf /webkit/tools
parentae9340b0a6fab4fb69896c95400f1095d1184cea (diff)
downloadchromium_src-59bbde10b721f5d8a22c800abfef4e180e752130.zip
chromium_src-59bbde10b721f5d8a22c800abfef4e180e752130.tar.gz
chromium_src-59bbde10b721f5d8a22c800abfef4e180e752130.tar.bz2
Mark redirect-cross-origin-tripmine.html as timing out.
Partial revert of http://codereview.chromium.org/387034 BUG=none TEST=none TBR=dpranke Review URL: http://codereview.chromium.org/391038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31851 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 8fadd65..daefbd9 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2410,6 +2410,9 @@ BUG20570 : LayoutTests/http/tests/navigation/onload-navigation-iframe-timeout.ht
BUG20570 : LayoutTests/http/tests/navigation/onload-navigation-iframe.html = TIMEOUT
BUG20570 : LayoutTests/http/tests/navigation/onload-navigation-iframe-2.html = TIMEOUT
+// This test isn't just slow -- sometimes it times out indefinitely.
+BUG10475 : LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-tripmine.html = TIMEOUT PASS
+
SKIP BUG9613 : LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved.html = PASS
// Merge WebKit 42133:42199 regressions