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
CrOS-Libchrome-Original-Commit: a67fc9e162b895cf642c077de28c73172066c558
diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc
index ee73ef3..bb9d814 100644
--- a/base/file_util_unittest.cc
+++ b/base/file_util_unittest.cc
@@ -340,7 +340,7 @@
};
// Flaky, http://crbug.com/46246
-TEST_F(FileUtilTest, FLAKY_CountFilesCreatedAfter) {
+TEST_F(FileUtilTest, DISABLED_CountFilesCreatedAfter) {
// Create old file (that we don't want to count)
FilePath old_file_name =
temp_dir_.path().Append(FILE_PATH_LITERAL("Old File.txt"));
diff --git a/base/files/file_path_watcher_browsertest.cc b/base/files/file_path_watcher_browsertest.cc
index f0f789a..5d466db 100644
--- a/base/files/file_path_watcher_browsertest.cc
+++ b/base/files/file_path_watcher_browsertest.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.
@@ -270,7 +270,7 @@
// notification.
// Flaky on MacOS. http://crbug.com/85930
#if defined(OS_MACOSX)
-#define MAYBE_DestroyWithPendingNotification FLAKY_DestroyWithPendingNotification
+#define MAYBE_DestroyWithPendingNotification DISABLED_DestroyWithPendingNotification
#else
#define MAYBE_DestroyWithPendingNotification DestroyWithPendingNotification
#endif
@@ -352,7 +352,7 @@
#if defined(OS_MACOSX)
// http://crbug.com/85930
-#define DisappearingDirectory FLAKY_DisappearingDirectory
+#define DisappearingDirectory DISABLED_DisappearingDirectory
#endif
TEST_F(FilePathWatcherTest, DisappearingDirectory) {
FilePathWatcher watcher;
diff --git a/base/metrics/stats_table_unittest.cc b/base/metrics/stats_table_unittest.cc
index 1ccde4d..0a1c38b 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 @@
// 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 @@
// 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;
diff --git a/base/platform_file_unittest.cc b/base/platform_file_unittest.cc
index c958bc7..671deb0 100644
--- a/base/platform_file_unittest.cc
+++ b/base/platform_file_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.
@@ -260,7 +260,7 @@
}
// Flakily fails: http://crbug.com/86494
-TEST(PlatformFile, FLAKY_TouchGetInfoPlatformFile) {
+TEST(PlatformFile, DISABLED_TouchGetInfoPlatformFile) {
ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
base::PlatformFile file = base::CreatePlatformFile(
diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc
index 23f9940..399f824 100644
--- a/base/process_util_unittest.cc
+++ b/base/process_util_unittest.cc
@@ -146,13 +146,7 @@
}
// Times out on Linux and Win, flakes on other platforms, http://crbug.com/95058
-#if defined(OS_LINUX) || defined(OS_WIN)
-#define MAYBE_GetTerminationStatusExit DISABLED_GetTerminationStatusExit
-#else
-#define MAYBE_GetTerminationStatusExit FLAKY_GetTerminationStatusExit
-#endif
-
-TEST_F(ProcessUtilTest, MAYBE_GetTerminationStatusExit) {
+TEST_F(ProcessUtilTest, DISABLED_GetTerminationStatusExit) {
remove(kSignalFileSlow);
base::ProcessHandle handle = this->SpawnChild("SlowChildProcess", false);
ASSERT_NE(base::kNullProcessHandle, handle);
diff --git a/base/shared_memory_unittest.cc b/base/shared_memory_unittest.cc
index a0df9b5..57b9eae 100644
--- a/base/shared_memory_unittest.cc
+++ b/base/shared_memory_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.
@@ -404,9 +404,9 @@
const char* const SharedMemoryProcessTest::s_test_name_ = "MPMem";
-
+// http://crbug.com/61589
#if defined(OS_MACOSX)
-#define MAYBE_Tasks FLAKY_Tasks
+#define MAYBE_Tasks DISABLED_Tasks
#else
#define MAYBE_Tasks Tasks
#endif
diff --git a/base/timer_unittest.cc b/base/timer_unittest.cc
index d4b666f..929bd38 100644
--- a/base/timer_unittest.cc
+++ b/base/timer_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.
@@ -320,7 +320,7 @@
}
// It's flaky on the buildbot, http://crbug.com/25038.
-TEST(TimerTest, FLAKY_DelayTimer_Reset) {
+TEST(TimerTest, DISABLED_DelayTimer_Reset) {
RunTest_DelayTimer_Reset(MessageLoop::TYPE_DEFAULT);
RunTest_DelayTimer_Reset(MessageLoop::TYPE_UI);
RunTest_DelayTimer_Reset(MessageLoop::TYPE_IO);