summaryrefslogtreecommitdiffstats
path: root/webkit/tools/layout_tests
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-19 05:19:45 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-19 05:19:45 +0000
commit0f12f892066a9cb8396e67aa0a6e956d7a625cc5 (patch)
treeb6116108926ab884f75f102ebca279a642ff964e /webkit/tools/layout_tests
parent12dc10faf13ff52d6e63baf7b5fcc05002c8f831 (diff)
downloadchromium_src-0f12f892066a9cb8396e67aa0a6e956d7a625cc5.zip
chromium_src-0f12f892066a9cb8396e67aa0a6e956d7a625cc5.tar.gz
chromium_src-0f12f892066a9cb8396e67aa0a6e956d7a625cc5.tar.bz2
Try to fix flaky websocket tests.
Some websoket layout tests became flaky from r41818. This is because it adds websocket throttling in WebSocketJob. Make sure Close() will call OnClose() even if it is waiting resolving or waiting in throttling queue, so that WebSocketJob is removed from throttling queue and wake up next WebSocketJob. BUG=38397 TEST=layout tests websocket/tests passes Review URL: http://codereview.chromium.org/1096001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42074 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/layout_tests')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt7
1 files changed, 0 insertions, 7 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 4699ad1..d5f9c337 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2820,13 +2820,6 @@ BUG38353 MAC LINUX : http/tests/plugins/plugin-document-has-focus.html = TIMEOUT
BUG38392 : plugins/resize-from-plugin.html = TEXT
-// Chromium r41818 makes these flaky.
-BUG38397 : websocket/tests/url-with-credential.html = TEXT PASS
-BUG38397 : websocket/tests/url-with-empty-query.html = TEXT PASS
-BUG38397 : websocket/tests/url-with-query-for-no-query.html = TEXT PASS
-BUG38397 : websocket/tests/url-with-query.html = TEXT PASS
-BUG38397 : websocket/tests/websocket-pending-activity.html = TIMEOUT PASS
-
// One pixel changes from gray 0x83 to gray 0x81. Valgrind is clean.
BUG38534 LINUX : tables/mozilla/bugs/bug20804.html = IMAGE PASS