summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authoratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-28 02:55:04 +0000
committeratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-28 02:55:04 +0000
commitb174755cd8752ec74b157b50cd256f42ad1314cb (patch)
tree97e239e7f32a13a813f030c1cc63966baf74412f /chrome
parent628b7ca7aa2d5de5acd93eef56c08d46b85e2527 (diff)
downloadchromium_src-b174755cd8752ec74b157b50cd256f42ad1314cb.zip
chromium_src-b174755cd8752ec74b157b50cd256f42ad1314cb.tar.gz
chromium_src-b174755cd8752ec74b157b50cd256f42ad1314cb.tar.bz2
Disabling new worker http auth tests that are failing on windows and linux valgrind.
BUG=28439,33344 TEST=existing tests suffice Review URL: http://codereview.chromium.org/549188 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37375 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/test/data/valgrind/ui_tests.gtest_linux.txt4
-rw-r--r--chrome/worker/worker_uitest.cc7
2 files changed, 11 insertions, 0 deletions
diff --git a/chrome/test/data/valgrind/ui_tests.gtest_linux.txt b/chrome/test/data/valgrind/ui_tests.gtest_linux.txt
index 9b4b53d..7699904 100644
--- a/chrome/test/data/valgrind/ui_tests.gtest_linux.txt
+++ b/chrome/test/data/valgrind/ui_tests.gtest_linux.txt
@@ -12,3 +12,7 @@ WorkerTest.IncognitoSharedWorkers
WorkerTest.WorkerHttpLayoutTests
# See http://crbug.com/32192
WorkerTest.WorkerWebSocketLayoutTests
+
+# Fails due to mmap failure (http://crbug.com/28439)
+WorkerTest.SharedWorkerHttpAuth
+WorkerTest.WorkerHttpAuth
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index ced60bf..e0742ff 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -185,6 +185,13 @@ TEST_F(WorkerTest, IncognitoSharedWorkers) {
const wchar_t kDocRoot[] = L"chrome/test/data/workers";
+#if defined(OS_WIN)
+// http://crbug.com/33344 - NavigateAndWaitForAuth times out on the Windows
+// build bots.
+#define WorkerHttpAuth DISABLED_WorkerHttpAuth
+#define SharedWorkerHttpAuth DISABLED_SharedWorkerHttpAuth
+#endif
+
// Make sure that auth dialog is displayed from worker context.
TEST_F(WorkerTest, WorkerHttpAuth) {
scoped_refptr<HTTPTestServer> server =