Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1185)

Side by Side Diff: content/browser/worker_host/test/worker_browsertest.cc

Issue 10441073: Disable tests that flake/fail inside the Linux SUID sandbox. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Enhanced comments Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/file_path.h" 6 #include "base/file_path.h"
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 364
365 // Make sure that auth dialog is displayed from shared worker context. 365 // Make sure that auth dialog is displayed from shared worker context.
366 // http://crbug.com/33344 366 // http://crbug.com/33344
367 IN_PROC_BROWSER_TEST_F(WorkerTest, SharedWorkerHttpAuth) { 367 IN_PROC_BROWSER_TEST_F(WorkerTest, SharedWorkerHttpAuth) {
368 ASSERT_TRUE(test_server()->Start()); 368 ASSERT_TRUE(test_server()->Start());
369 GURL url = test_server()->GetURL("files/workers/shared_worker_auth.html"); 369 GURL url = test_server()->GetURL("files/workers/shared_worker_auth.html");
370 ui_test_utils::NavigateToURLWithDisposition( 370 ui_test_utils::NavigateToURLWithDisposition(
371 browser(), url, CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_AUTH); 371 browser(), url, CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_AUTH);
372 } 372 }
373 373
374 #if defined(OS_LINUX) || defined(OS_CHROMEOS)
375 // This test is flaky inside the Linux SUID sandbox.
376 // http://crbug.com/130116
377 IN_PROC_BROWSER_TEST_F(WorkerTest, DISABLED_LimitPerPage) {
378 #else
374 IN_PROC_BROWSER_TEST_F(WorkerTest, LimitPerPage) { 379 IN_PROC_BROWSER_TEST_F(WorkerTest, LimitPerPage) {
380 #endif
375 int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate; 381 int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate;
376 std::string query = StringPrintf("?count=%d", max_workers_per_tab + 1); 382 std::string query = StringPrintf("?count=%d", max_workers_per_tab + 1);
377 383
378 GURL url = GetTestURL("many_shared_workers.html", query); 384 GURL url = GetTestURL("many_shared_workers.html", query);
379 ui_test_utils::NavigateToURL(browser(), url); 385 ui_test_utils::NavigateToURL(browser(), url);
380 ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab)); 386 ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab));
381 } 387 }
382 388
389 #if defined(OS_LINUX) || defined(OS_CHROMEOS)
390 // This test is flaky inside the Linux SUID sandbox.
391 // http://crbug.com/130116
392 IN_PROC_BROWSER_TEST_F(WorkerTest, DISABLED_LimitTotal) {
393 #else
383 // http://crbug.com/36800 394 // http://crbug.com/36800
384 IN_PROC_BROWSER_TEST_F(WorkerTest, LimitTotal) { 395 IN_PROC_BROWSER_TEST_F(WorkerTest, LimitTotal) {
396 #endif
385 if (base::SysInfo::AmountOfPhysicalMemoryMB() < 8192) { 397 if (base::SysInfo::AmountOfPhysicalMemoryMB() < 8192) {
386 LOG(INFO) << "WorkerTest.LimitTotal not running because it needs 8 GB RAM."; 398 LOG(INFO) << "WorkerTest.LimitTotal not running because it needs 8 GB RAM.";
387 return; 399 return;
388 } 400 }
389 401
390 int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate; 402 int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate;
391 int total_workers = WorkerServiceImpl::kMaxWorkersWhenSeparate; 403 int total_workers = WorkerServiceImpl::kMaxWorkersWhenSeparate;
392 404
393 std::string query = StringPrintf("?count=%d", max_workers_per_tab); 405 std::string query = StringPrintf("?count=%d", max_workers_per_tab);
394 GURL url = GetTestURL("many_shared_workers.html", query); 406 GURL url = GetTestURL("many_shared_workers.html", query);
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 // the same worker that was queued in the first window, to ensure it gets 487 // the same worker that was queued in the first window, to ensure it gets
476 // connected to the first window too. 488 // connected to the first window too.
477 query = StringPrintf("?id=%d", max_workers_per_tab); 489 query = StringPrintf("?id=%d", max_workers_per_tab);
478 url = GetTestURL("single_shared_worker.html", query); 490 url = GetTestURL("single_shared_worker.html", query);
479 ui_test_utils::NavigateToURLWithDisposition( 491 ui_test_utils::NavigateToURLWithDisposition(
480 browser(), url, NEW_FOREGROUND_TAB, 492 browser(), url, NEW_FOREGROUND_TAB,
481 ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB); 493 ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
482 494
483 ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab + 1)); 495 ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab + 1));
484 } 496 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698