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

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

Issue 2764783002: fix typo in test to disable them for real (Closed)
Patch Set: DISABLE -> DISABLED Created 3 years, 9 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 "chrome/browser/chromeos/drive/file_system_util.h" 9 #include "chrome/browser/chromeos/drive/file_system_util.h"
10 #include "chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h" 10 #include "chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h"
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 TestParameter(NOT_IN_GUEST_MODE, "renameNewDirectoryDownloads"), 173 TestParameter(NOT_IN_GUEST_MODE, "renameNewDirectoryDownloads"),
174 TestParameter(NOT_IN_GUEST_MODE, "renameNewDirectoryDrive"))); 174 TestParameter(NOT_IN_GUEST_MODE, "renameNewDirectoryDrive")));
175 175
176 #if defined(DISABLE_SLOW_FILESAPP_TESTS) 176 #if defined(DISABLE_SLOW_FILESAPP_TESTS)
177 #define MAYBE_Delete DISABLED_Delete 177 #define MAYBE_Delete DISABLED_Delete
178 #else 178 #else
179 #define MAYBE_Delete Delete 179 #define MAYBE_Delete Delete
180 #endif 180 #endif
181 // Flaky: crbug.com/699426 181 // Flaky: crbug.com/699426
182 WRAPPED_INSTANTIATE_TEST_CASE_P( 182 WRAPPED_INSTANTIATE_TEST_CASE_P(
183 DISABLE_Delete, 183 DISABLED_Delete,
184 FileManagerBrowserTest, 184 FileManagerBrowserTest,
185 ::testing::Values( 185 ::testing::Values(
186 TestParameter(NOT_IN_GUEST_MODE, 186 TestParameter(NOT_IN_GUEST_MODE,
187 "deleteMenuItemIsDisabledWhenNoItemIsSelected"), 187 "deleteMenuItemIsDisabledWhenNoItemIsSelected"),
188 TestParameter(NOT_IN_GUEST_MODE, "deleteOneItemFromToolbar"))); 188 TestParameter(NOT_IN_GUEST_MODE, "deleteOneItemFromToolbar")));
189 189
190 WRAPPED_INSTANTIATE_TEST_CASE_P( 190 WRAPPED_INSTANTIATE_TEST_CASE_P(
191 DISABLED_QuickView, 191 DISABLED_QuickView,
192 FileManagerBrowserTest, 192 FileManagerBrowserTest,
193 ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "openQuickView"))); 193 ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "openQuickView")));
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 TestParameter(NOT_IN_GUEST_MODE, "traverseDownloads"), 342 TestParameter(NOT_IN_GUEST_MODE, "traverseDownloads"),
343 TestParameter(NOT_IN_GUEST_MODE, "traverseDrive"))); 343 TestParameter(NOT_IN_GUEST_MODE, "traverseDrive")));
344 344
345 #if defined(DISABLE_SLOW_FILESAPP_TESTS) 345 #if defined(DISABLE_SLOW_FILESAPP_TESTS)
346 #define MAYBE_SuggestAppDialog DISABLED_SuggestAppDialog 346 #define MAYBE_SuggestAppDialog DISABLED_SuggestAppDialog
347 #else 347 #else
348 #define MAYBE_SuggestAppDialog SuggestAppDialog 348 #define MAYBE_SuggestAppDialog SuggestAppDialog
349 #endif 349 #endif
350 // Flaky: crbug.com/701923 350 // Flaky: crbug.com/701923
351 WRAPPED_INSTANTIATE_TEST_CASE_P( 351 WRAPPED_INSTANTIATE_TEST_CASE_P(
352 DISABLE_SuggestAppDialog, 352 DISABLED_SuggestAppDialog,
353 FileManagerBrowserTest, 353 FileManagerBrowserTest,
354 ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "suggestAppDialog"))); 354 ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "suggestAppDialog")));
355 355
356 #if defined(DISABLE_SLOW_FILESAPP_TESTS) 356 #if defined(DISABLE_SLOW_FILESAPP_TESTS)
357 #define MAYBE_ExecuteDefaultTaskOnDownloads \ 357 #define MAYBE_ExecuteDefaultTaskOnDownloads \
358 DISABLED_ExecuteDefaultTaskOnDownloads 358 DISABLED_ExecuteDefaultTaskOnDownloads
359 #else 359 #else
360 #define MAYBE_ExecuteDefaultTaskOnDownloads ExecuteDefaultTaskOnDownloads 360 #define MAYBE_ExecuteDefaultTaskOnDownloads ExecuteDefaultTaskOnDownloads
361 #endif 361 #endif
362 // Flaky: crbug.com/699171 362 // Flaky: crbug.com/699171
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 706
707 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, MAYBE_BasicDrive) { 707 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, MAYBE_BasicDrive) {
708 AddAllUsers(); 708 AddAllUsers();
709 709
710 // Sanity check that normal operations work in multi-profile setting as well. 710 // Sanity check that normal operations work in multi-profile setting as well.
711 set_test_case_name("keyboardCopyDrive"); 711 set_test_case_name("keyboardCopyDrive");
712 StartTest(); 712 StartTest();
713 } 713 }
714 714
715 } // namespace file_manager 715 } // 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