Add shared memory cleanup before/after all tests
Cleanup was already in place, but was missing
for StatsRate and StatsCounterTimer.
This should *hopefully* remove apparent flakiness
seen when running StatsRate alone in a test bot.
bug=131024
r=asvitkine
Review URL: https://chromiumcodereview.appspot.com/10538027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140830 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: fd172369307dcdadc3771053c38b1aa387fce495
diff --git a/base/metrics/stats_table_unittest.cc b/base/metrics/stats_table_unittest.cc
index 44625bf..634bb87 100644
--- a/base/metrics/stats_table_unittest.cc
+++ b/base/metrics/stats_table_unittest.cc
@@ -312,6 +312,7 @@
const std::string kTableName = "StatTable";
const int kMaxThreads = 20;
const int kMaxCounter = 5;
+ DeleteShmem(kTableName);
StatsTable table(kTableName, kMaxThreads, kMaxCounter);
StatsTable::set_current(&table);
@@ -337,15 +338,16 @@
bar.Stop();
EXPECT_GT(table.GetCounterValue("t:bar"), 0);
EXPECT_LE(kDuration.InMilliseconds() * 2, table.GetCounterValue("t:bar"));
+ DeleteShmem(kTableName);
}
// Test some basic StatsRate operations
-// Usually fails on all platforms when run alone. http://crbug.com/131024
-TEST_F(StatsTableTest, DISABLED_StatsRate) {
+TEST_F(StatsTableTest, StatsRate) {
// Create a stats table.
const std::string kTableName = "StatTable";
const int kMaxThreads = 20;
const int kMaxCounter = 5;
+ DeleteShmem(kTableName);
StatsTable table(kTableName, kMaxThreads, kMaxCounter);
StatsTable::set_current(&table);
@@ -371,6 +373,7 @@
baz.Stop();
EXPECT_EQ(2, table.GetCounterValue("c:baz"));
EXPECT_LE(kDuration.InMilliseconds() * 2, table.GetCounterValue("t:baz"));
+ DeleteShmem(kTableName);
}
// Test some basic StatsScope operations