summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorvandebo@google.com <vandebo@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-03 02:43:06 +0000
committervandebo@google.com <vandebo@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-03 02:43:06 +0000
commit084381e2e2c5736cde41b9e76823161db94b9678 (patch)
tree0bff7dbcef7b7cf8878ed70adb1787980e86752b /webkit
parent49605eeef01a02e980a689ec7047cf5b60781993 (diff)
downloadchromium_src-084381e2e2c5736cde41b9e76823161db94b9678.zip
chromium_src-084381e2e2c5736cde41b9e76823161db94b9678.tar.gz
chromium_src-084381e2e2c5736cde41b9e76823161db94b9678.tar.bz2
remove-cache.html, fail-on-update.html, etc continue to timeout even after being marked as slow.
Revert 33624 - Enable all but a few appcache layout tests. TEST=none BUG=2844 Review URL: http://codereview.chromium.org/465011 TBR=jennb@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33657 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt11
1 files changed, 5 insertions, 6 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 6498abf..350eab9 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1226,12 +1226,11 @@ BUG10313 : LayoutTests/plugins/bindings-test.html = FAIL
// question mark) in them
BUG10315 WIN LINUX : LayoutTests/fast/encoding/invalid-UTF-8.html = FAIL
-// These fail because chromium's appcache is async but webkit's is not.
-BUG2844 SKIP : LayoutTests/http/tests/appcache/idempotent-update.html = FAIL
-BUG2844 SKIP : LayoutTests/http/tests/appcache/top-frame-2.html = FAIL
-
-// This test fails because there is no setAppCacheMaximumSize API yet.
-BUG2844 SKIP : LayoutTests/http/tests/appcache/max-size.html = FAIL
+// These require application cache to be enabled. Skip the tests because
+// they're all timing out. TODO(tc): Upstream changes to the test so they
+// fail quickly if window.applicationCache is undefined (then we don't have to
+// skip them).
+BUG2844 SKIP : LayoutTests/http/tests/appcache = TIMEOUT FAIL
// V8 failures as a result of the WebKit merge.
// http://code.google.com/p/v8/issues/detail?id=92