summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjennb@chromium.org <jennb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-03 22:55:19 +0000
committerjennb@chromium.org <jennb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-03 22:55:19 +0000
commit040f0b84613e1b760aecbf1a0bc0428f4369012b (patch)
tree6fe1931a82802f291492fa40b70a758c7f4a0ab1 /webkit
parent750be587dc23bfdac69e846c076a02ffac25411f (diff)
downloadchromium_src-040f0b84613e1b760aecbf1a0bc0428f4369012b.zip
chromium_src-040f0b84613e1b760aecbf1a0bc0428f4369012b.tar.gz
chromium_src-040f0b84613e1b760aecbf1a0bc0428f4369012b.tar.bz2
Re-enable the appcache layout tests with more specific expectations for the flaky tests.
TEST=none BUG=2844 Review URL: http://codereview.chromium.org/468010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33742 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt24
1 files changed, 16 insertions, 8 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 24b584e..a7bb8f0 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -94,6 +94,8 @@ BUG24182 SLOW WIN : LayoutTests/fast/backgrounds/svg-as-background-5.html = PASS
BUG24182 SLOW DEBUG : LayoutTests/svg/css/getComputedStyle-basic.xhtml = PASS
BUG24182 SLOW : LayoutTests/http/tests/appcache/fallback.html = PASS
+BUG24182 SLOW : LayoutTests/http/tests/appcache/auth.html = PASS
+
// --- collecting results for supported-xml-content-types.html ---
// was slow, started to timeout
@@ -1221,12 +1223,6 @@ BUG10313 : LayoutTests/plugins/bindings-test.html = FAIL
// question mark) in them
BUG10315 WIN LINUX : LayoutTests/fast/encoding/invalid-UTF-8.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
@@ -2975,11 +2971,23 @@ BUG_OJAN MAC : LayoutTests/http/tests/xmlhttprequest/web-apps/012.html = TEXT PA
// These tests time out *and* are slow. The test should be fixed to not timeout,
// then should be marked as SLOW/PASS.
-BUG2844 : LayoutTests/http/tests/appcache/remove-cache.html = TIMEOUT PASS
-BUG2844 : LayoutTests/http/tests/appcache/update-cache.html = TIMEOUT PASS
BUG2844 : LayoutTests/http/tests/appcache/cyrillic-uri.html = TIMEOUT PASS
BUG2844 : LayoutTests/http/tests/appcache/fail-on-update.html = TIMEOUT PASS
BUG2844 : LayoutTests/http/tests/appcache/offline-access.html = TIMEOUT PASS
+BUG2844 : LayoutTests/http/tests/appcache/remove-cache.html = TIMEOUT PASS
+BUG2844 : LayoutTests/http/tests/appcache/update-cache.html = TIMEOUT PASS
+
+// These tests sometimes pass and sometimes have a text difference due
+// to chromium's appcache being async.
+BUG2844 : LayoutTests/http/tests/appcache/top-frame-3.html = TEXT PASS
+BUG2844 : LayoutTests/http/tests/appcache/top-frame-4.html = TEXT PASS
+
+// 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
// Failures in TestShell that resulted from Mac plugin/focus fixes in r32631.
BUG28380 MAC : LayoutTests/fast/events/tabindex-focus-blur-all.html = CRASH FAIL