summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-07 17:36:55 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-07 17:36:55 +0000
commit18b0832d7e012df21a196777add97c67e4b72cd9 (patch)
treea8200c9bcab217e6914a4672baa48f3dcfd7f570 /base
parentde9188c6cdceead0e39cfcc40876a83db08e7d5c (diff)
downloadchromium_src-18b0832d7e012df21a196777add97c67e4b72cd9.zip
chromium_src-18b0832d7e012df21a196777add97c67e4b72cd9.tar.gz
chromium_src-18b0832d7e012df21a196777add97c67e4b72cd9.tar.bz2
Mark StatsTableTest.MultipleThreads as flaky
instead of using #if 0. TBR=maruel TEST=none BUG=10611 Review URL: http://codereview.chromium.org/1990007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46707 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/stats_table_unittest.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/base/stats_table_unittest.cc b/base/stats_table_unittest.cc
index 0793351..bb7dacd 100644
--- a/base/stats_table_unittest.cc
+++ b/base/stats_table_unittest.cc
@@ -109,9 +109,8 @@ void StatsTableThread::Run() {
// Create a few threads and have them poke on their counters.
// Currently disabled. See bug report below:
-// TODO(maruel): http://crbug.com/10611
-TEST_F(StatsTableTest, MultipleThreads) {
-#if 0
+// Flaky, http://crbug.com/10611
+TEST_F(StatsTableTest, FLAKY_MultipleThreads) {
// Create a stats table.
const std::string kTableName = "MultipleThreadStatTable";
const int kMaxThreads = 20;
@@ -164,7 +163,6 @@ TEST_F(StatsTableTest, MultipleThreads) {
EXPECT_EQ(0, table.CountThreadsRegistered());
DeleteShmem(kTableName);
-#endif
}
const std::string kMPTableName = "MultipleProcessStatTable";