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

Unified Diff: chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc

Issue 410843003: Disable all the tests that are flaking more than 5% on Windows builders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc b/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
index cf7da82f94927cec8778b977d1472d0c966af0f9..c0fcc6687d70640780f31c2547ac1f24ba9b73cf 100644
--- a/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
@@ -949,7 +949,13 @@ TEST_F(DriveBackendSyncTest, ReorganizeToUnmanagedArea) {
EXPECT_EQ(4u, CountTracker());
}
-TEST_F(DriveBackendSyncTest, ReorganizeToMultipleParents) {
+#if defined(OS_WIN)
+// http://crbug.com/396388
+#define MAYBE_ReorganizeToMultipleParents DISABLED_ReorganizeToMultipleParents
+#else
+#define MAYBE_ReorganizeToMultipleParents ReorganizeToMultipleParents
+#endif
+TEST_F(DriveBackendSyncTest, MAYBE_ReorganizeToMultipleParents) {
std::string app_id = "example";
RegisterApp(app_id);
@@ -1024,8 +1030,13 @@ TEST_F(DriveBackendSyncTest, ReorganizeAndRevert) {
EXPECT_EQ(5u, CountMetadata());
EXPECT_EQ(5u, CountTracker());
}
-
-TEST_F(DriveBackendSyncTest, ConflictTest_AddFolder_AddFolder) {
+#if defined(OS_WIN)
+// http://crbug.com/396388
+#define MAYBE_ConflictTest_ConflictTest_AddFolder_AddFolder DISABLED_ConflictTest_ConflictTest_AddFolder_AddFolder
+#else
+#define MAYBE_ConflictTest_ConflictTest_AddFolder_AddFolder ConflictTest_ConflictTest_AddFolder_AddFolder
+#endif
+TEST_F(DriveBackendSyncTest, MAYBE_ConflictTest_ConflictTest_AddFolder_AddFolder) {
std::string app_id = "example";
RegisterApp(app_id);
@@ -1097,7 +1108,13 @@ TEST_F(DriveBackendSyncTest, ConflictTest_AddFolder_DeleteFolder) {
EXPECT_EQ(3u, CountTracker());
}
-TEST_F(DriveBackendSyncTest, ConflictTest_AddFolder_AddFile) {
+#if defined(OS_WIN)
+// http://crbug.com/396388
+#define MAYBE_ConflictTest_AddFolder_AddFile DISABLED_ConflictTest_AddFolder_AddFile
+#else
+#define MAYBE_ConflictTest_AddFolder_AddFile ConflictTest_AddFolder_AddFile
+#endif
+TEST_F(DriveBackendSyncTest, MAYBE_ConflictTest_AddFolder_AddFile) {
std::string app_id = "example";
RegisterApp(app_id);
@@ -1321,7 +1338,13 @@ TEST_F(DriveBackendSyncTest, ConflictTest_DeleteFolder_DeleteFile) {
EXPECT_EQ(2u, CountTracker());
}
-TEST_F(DriveBackendSyncTest, ConflictTest_AddFile_AddFolder) {
+#if defined(OS_WIN)
+// http://crbug.com/396388
+#define MAYBE_ConflictTest_AddFile_AddFolder DISABLED_ConflictTest_AddFile_AddFolder
+#else
+#define MAYBE_ConflictTest_AddFile_AddFolder ConflictTest_AddFile_AddFolder
+#endif
+TEST_F(DriveBackendSyncTest, MAYBE_ConflictTest_AddFile_AddFolder) {
std::string app_id = "example";
RegisterApp(app_id);
@@ -1403,7 +1426,13 @@ TEST_F(DriveBackendSyncTest, ConflictTest_AddFile_DeleteFolder) {
EXPECT_EQ(4u, CountTracker());
}
-TEST_F(DriveBackendSyncTest, ConflictTest_AddFile_AddFile) {
+#if defined(OS_WIN)
+// http://crbug.com/396388
+#define MAYBE_ConflictTest_AddFile_AddFile DISABLED_ConflictTest_AddFile_AddFile
+#else
+#define MAYBE_ConflictTest_AddFile_AddFile ConflictTest_AddFile_AddFile
+#endif
+TEST_F(DriveBackendSyncTest, MAYBE_ConflictTest_AddFile_AddFile) {
std::string app_id = "example";
RegisterApp(app_id);

Powered by Google App Engine
This is Rietveld 408576698