diff options
| author | benwells <benwells@chromium.org> | 2015-05-11 19:15:57 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-12 02:17:15 +0000 |
| commit | 88912d80f0b54afaa81d86fda355dfc8915ef003 (patch) | |
| tree | 019a8a9652385f7c1edd19b14d8e676380df8690 | |
| parent | ce2699e20c3eae9dc17573fd2eb0885875341f44 (diff) | |
| download | chromium_src-88912d80f0b54afaa81d86fda355dfc8915ef003.zip chromium_src-88912d80f0b54afaa81d86fda355dfc8915ef003.tar.gz chromium_src-88912d80f0b54afaa81d86fda355dfc8915ef003.tar.bz2 | |
Disable some AppList interactive UI tests under Linux.
TBR=mgiuca@chromium.org
BUG=396499, 483615
Review URL: https://codereview.chromium.org/1137073004
Cr-Commit-Position: refs/heads/master@{#329323}
| -rw-r--r-- | chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc b/chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc index 9756c3a..7158f96 100644 --- a/chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc +++ b/chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc @@ -59,17 +59,12 @@ class AppListServiceInteractiveTest : public InProcessBrowserTest { #define MAYBE_SwitchAppListLockedProfile DISABLED_SwitchAppListLockedProfile #define MAYBE_SwitchAppListProfilesDuringSearch \ DISABLED_SwitchAppListProfilesDuringSearch -#define MAYBE_ShowAppListNonDefaultProfile \ - DISABLED_ShowAppListNonDefaultProfile -#define MAYBE_DeleteShowingAppList DISABLED_DeleteShowingAppList #else #define MAYBE_ShowAndDismiss ShowAndDismiss #define MAYBE_SwitchAppListProfiles SwitchAppListProfiles #define MAYBE_SwitchAppListLockedProfile SwitchAppListLockedProfile #define MAYBE_SwitchAppListProfilesDuringSearch \ SwitchAppListProfilesDuringSearch -#define MAYBE_ShowAppListNonDefaultProfile ShowAppListNonDefaultProfile -#define MAYBE_DeleteShowingAppList DeleteShowingAppList #endif // Show the app list, then dismiss it. @@ -220,7 +215,7 @@ class ShowAppListInteractiveTest : public InProcessBrowserTest { }; // Test showing the app list using the command line switch. -#if defined(OS_CHROMEOS) +#if defined(OS_LINUX) // http://crbug.com/396499 #define MAYBE_ShowAppListFlag DISABLED_ShowAppListFlag #else @@ -255,6 +250,17 @@ IN_PROC_BROWSER_TEST_F(ShowAppListInteractiveTest, MAYBE_ShowAppListFlag) { #endif } +// ChromeOS does not support ShowForProfile(), or profile switching within the +// app list. Profile switching on CrOS goes through a different code path. Also +// these tests are flaky on Linux. See http://crbug.com/483615. +#if defined(OS_LINUX) +#define MAYBE_ShowAppListNonDefaultProfile \ + DISABLED_ShowAppListNonDefaultProfile +#define MAYBE_DeleteShowingAppList DISABLED_DeleteShowingAppList +#else +#define MAYBE_ShowAppListNonDefaultProfile ShowAppListNonDefaultProfile +#define MAYBE_DeleteShowingAppList DeleteShowingAppList +#endif // Interactive UI test that creates a non-default profile and configures it for // the --show-app-list flag. class ShowAppListNonDefaultInteractiveTest : public ShowAppListInteractiveTest { |