summaryrefslogtreecommitdiffstats
path: root/base/metrics
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-14 00:29:14 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-14 00:29:14 +0000
commita67fc9e162b895cf642c077de28c73172066c558 (patch)
tree9376b03fd1f3ae84d2fd4c01f3b464580398c900 /base/metrics
parent00d320a6e403c645dc00d47217028aef5f2792a0 (diff)
downloadchromium_src-a67fc9e162b895cf642c077de28c73172066c558.zip
chromium_src-a67fc9e162b895cf642c077de28c73172066c558.tar.gz
chromium_src-a67fc9e162b895cf642c077de28c73172066c558.tar.bz2
Flakiness cleanup: disable flaky tests under base/
See https://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/fcec09fc659f39a6 BUG=46246,85930,10611,86494,95058,61589,25038 Review URL: https://chromiumcodereview.appspot.com/9386014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121782 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/metrics')
-rw-r--r--base/metrics/stats_table_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/base/metrics/stats_table_unittest.cc b/base/metrics/stats_table_unittest.cc
index 1ccde4da..0a1c38bb 100644
--- a/base/metrics/stats_table_unittest.cc
+++ b/base/metrics/stats_table_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -107,7 +107,7 @@ void StatsTableThread::Run() {
// Create a few threads and have them poke on their counters.
// Flaky, http://crbug.com/10611.
-TEST_F(StatsTableTest, FLAKY_MultipleThreads) {
+TEST_F(StatsTableTest, DISABLED_MultipleThreads) {
// Create a stats table.
const std::string kTableName = "MultipleThreadStatTable";
const int kMaxThreads = 20;
@@ -187,7 +187,7 @@ MULTIPROCESS_TEST_MAIN(StatsTableMultipleProcessMain) {
// Create a few processes and have them poke on their counters.
// This test is slow and flaky http://crbug.com/10611
-TEST_F(StatsTableTest, FLAKY_MultipleProcesses) {
+TEST_F(StatsTableTest, DISABLED_MultipleProcesses) {
// Create a stats table.
const int kMaxProcs = 20;
const int kMaxCounter = 5;