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

Side by Side Diff: chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

Issue 2911963003: Restore disabled flaky tests of FileManager. (Closed)
Patch Set: Rebase. Created 3 years, 6 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "base/threading/thread_restrictions.h" 9 #include "base/threading/thread_restrictions.h"
10 #include "chrome/browser/chromeos/drive/file_system_util.h" 10 #include "chrome/browser/chromeos/drive/file_system_util.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 // Flaky: http://crbug.com/711290 125 // Flaky: http://crbug.com/711290
126 WRAPPED_INSTANTIATE_TEST_CASE_P( 126 WRAPPED_INSTANTIATE_TEST_CASE_P(
127 DISABLED_OpenImageFiles, 127 DISABLED_OpenImageFiles,
128 FileManagerBrowserTest, 128 FileManagerBrowserTest,
129 ::testing::Values(TestParameter(IN_GUEST_MODE, "imageOpenDownloads"), 129 ::testing::Values(TestParameter(IN_GUEST_MODE, "imageOpenDownloads"),
130 TestParameter(NOT_IN_GUEST_MODE, "imageOpenDownloads"), 130 TestParameter(NOT_IN_GUEST_MODE, "imageOpenDownloads"),
131 TestParameter(NOT_IN_GUEST_MODE, "imageOpenDrive"))); 131 TestParameter(NOT_IN_GUEST_MODE, "imageOpenDrive")));
132 132
133 // Flaky: crbug.com/715963 133 // Flaky: crbug.com/715963
134 WRAPPED_INSTANTIATE_TEST_CASE_P( 134 WRAPPED_INSTANTIATE_TEST_CASE_P(
135 DISABLED_CreateNewFolder, 135 CreateNewFolder,
136 FileManagerBrowserTest, 136 FileManagerBrowserTest,
137 ::testing::Values( 137 ::testing::Values(
138 TestParameter(NOT_IN_GUEST_MODE, "createNewFolderAfterSelectFile"), 138 TestParameter(NOT_IN_GUEST_MODE, "createNewFolderAfterSelectFile"),
139 TestParameter(IN_GUEST_MODE, "createNewFolderDownloads"), 139 TestParameter(IN_GUEST_MODE, "createNewFolderDownloads"),
140 TestParameter(NOT_IN_GUEST_MODE, "createNewFolderDownloads"), 140 TestParameter(NOT_IN_GUEST_MODE, "createNewFolderDownloads"),
141 TestParameter(NOT_IN_GUEST_MODE, "createNewFolderDrive"))); 141 TestParameter(NOT_IN_GUEST_MODE, "createNewFolderDrive")));
142 142
143 // Fails on official build. http://crbug.com/429294 143 // Fails on official build. http://crbug.com/429294
144 #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD) 144 #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
145 #define MAYBE_KeyboardOperations DISABLED_KeyboardOperations 145 #define MAYBE_KeyboardOperations DISABLED_KeyboardOperations
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 AddAllUsers(); 669 AddAllUsers();
670 670
671 // Sanity check that normal operations work in multi-profile setting as well. 671 // Sanity check that normal operations work in multi-profile setting as well.
672 set_test_case_name("keyboardCopyDownloads"); 672 set_test_case_name("keyboardCopyDownloads");
673 StartTest(); 673 StartTest();
674 } 674 }
675 675
676 // Flaky: crbug.com/715961. 676 // Flaky: crbug.com/715961.
677 // Previously it was disabled via DISABLE_SLOW_FILESAPP_TESTS and in 677 // Previously it was disabled via DISABLE_SLOW_FILESAPP_TESTS and in
678 // OFFICIAL_BUILD, see http://crbug.com/429294. 678 // OFFICIAL_BUILD, see http://crbug.com/429294.
679 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, 679 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, PRE_BasicDrive) {
680 DISABLED_PRE_BasicDrive) {
681 AddAllUsers(); 680 AddAllUsers();
682 } 681 }
683 682
684 // Fails on official build. http://crbug.com/429294 683 // Fails on official build. http://crbug.com/429294
685 #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD) 684 #if defined(DISABLE_SLOW_FILESAPP_TESTS) || defined(OFFICIAL_BUILD)
686 #define MAYBE_BasicDrive DISABLED_BasicDrive 685 #define MAYBE_BasicDrive DISABLED_BasicDrive
687 #else 686 #else
688 #define MAYBE_BasicDrive BasicDrive 687 #define MAYBE_BasicDrive BasicDrive
689 #endif 688 #endif
690 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, MAYBE_BasicDrive) { 689 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, MAYBE_BasicDrive) {
691 AddAllUsers(); 690 AddAllUsers();
692 691
693 // Sanity check that normal operations work in multi-profile setting as well. 692 // Sanity check that normal operations work in multi-profile setting as well.
694 set_test_case_name("keyboardCopyDrive"); 693 set_test_case_name("keyboardCopyDrive");
695 StartTest(); 694 StartTest();
696 } 695 }
697 696
698 } // namespace file_manager 697 } // namespace file_manager
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698