Commit d98b2ad1 authored by Andrew Xu's avatar Andrew Xu Committed by Commit Bot

Re-enable launcher tests

Re-enable those tests which were disabled due to crbug.com/1008744.

Bug: 1008744
Change-Id: Id67c436f50777631b855eb5c4405473dcadf14d5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1832708
Commit-Queue: Andrew Xu <andrewxu@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#701656}
parent be7d3e4e
...@@ -111,13 +111,6 @@ class LauncherAnimationsTestBase : public UIPerformanceTest, ...@@ -111,13 +111,6 @@ class LauncherAnimationsTestBase : public UIPerformanceTest,
DISALLOW_COPY_AND_ASSIGN(LauncherAnimationsTestBase); DISALLOW_COPY_AND_ASSIGN(LauncherAnimationsTestBase);
}; };
// TODO(crbug.com/1009459): many of these tests are failing on MSan builds.
#if defined(MEMORY_SANITIZER)
#define MAYBE_Run DISABLED_Run
#else
#define MAYBE_Run Run
#endif
class LauncherAnimationsFullscreenTest : public LauncherAnimationsTestBase { class LauncherAnimationsFullscreenTest : public LauncherAnimationsTestBase {
public: public:
LauncherAnimationsFullscreenTest() = default; LauncherAnimationsFullscreenTest() = default;
...@@ -133,7 +126,7 @@ class LauncherAnimationsFullscreenTest : public LauncherAnimationsTestBase { ...@@ -133,7 +126,7 @@ class LauncherAnimationsFullscreenTest : public LauncherAnimationsTestBase {
DISALLOW_COPY_AND_ASSIGN(LauncherAnimationsFullscreenTest); DISALLOW_COPY_AND_ASSIGN(LauncherAnimationsFullscreenTest);
}; };
IN_PROC_BROWSER_TEST_P(LauncherAnimationsFullscreenTest, MAYBE_Run) { IN_PROC_BROWSER_TEST_P(LauncherAnimationsFullscreenTest, Run) {
SendKeyAndWaitForState(ui::VKEY_BROWSER_SEARCH, true, SendKeyAndWaitForState(ui::VKEY_BROWSER_SEARCH, true,
ash::AppListViewState::kFullscreenAllApps); ash::AppListViewState::kFullscreenAllApps);
SendKeyAndWaitForState(ui::VKEY_BROWSER_SEARCH, true, SendKeyAndWaitForState(ui::VKEY_BROWSER_SEARCH, true,
...@@ -159,7 +152,7 @@ class LauncherAnimationsExpandToFullscreenTest ...@@ -159,7 +152,7 @@ class LauncherAnimationsExpandToFullscreenTest
DISALLOW_COPY_AND_ASSIGN(LauncherAnimationsExpandToFullscreenTest); DISALLOW_COPY_AND_ASSIGN(LauncherAnimationsExpandToFullscreenTest);
}; };
IN_PROC_BROWSER_TEST_P(LauncherAnimationsExpandToFullscreenTest, MAYBE_Run) { IN_PROC_BROWSER_TEST_P(LauncherAnimationsExpandToFullscreenTest, Run) {
SendKeyAndWaitForState(ui::VKEY_BROWSER_SEARCH, false, SendKeyAndWaitForState(ui::VKEY_BROWSER_SEARCH, false,
ash::AppListViewState::kPeeking); ash::AppListViewState::kPeeking);
SendKeyAndWaitForState(ui::VKEY_BROWSER_SEARCH, true, SendKeyAndWaitForState(ui::VKEY_BROWSER_SEARCH, true,
...@@ -187,7 +180,7 @@ class LauncherAnimationsPeekingTest : public LauncherAnimationsTestBase { ...@@ -187,7 +180,7 @@ class LauncherAnimationsPeekingTest : public LauncherAnimationsTestBase {
DISALLOW_COPY_AND_ASSIGN(LauncherAnimationsPeekingTest); DISALLOW_COPY_AND_ASSIGN(LauncherAnimationsPeekingTest);
}; };
IN_PROC_BROWSER_TEST_P(LauncherAnimationsPeekingTest, MAYBE_Run) { IN_PROC_BROWSER_TEST_P(LauncherAnimationsPeekingTest, Run) {
SendKeyAndWaitForState(ui::VKEY_BROWSER_SEARCH, false, SendKeyAndWaitForState(ui::VKEY_BROWSER_SEARCH, false,
ash::AppListViewState::kPeeking); ash::AppListViewState::kPeeking);
SendKeyAndWaitForState(ui::VKEY_BROWSER_SEARCH, false, SendKeyAndWaitForState(ui::VKEY_BROWSER_SEARCH, false,
......
...@@ -85,14 +85,7 @@ IN_PROC_BROWSER_TEST_P(LauncherDragTest, Open) { ...@@ -85,14 +85,7 @@ IN_PROC_BROWSER_TEST_P(LauncherDragTest, Open) {
ash::AppListViewState::kFullscreenAllApps); ash::AppListViewState::kFullscreenAllApps);
} }
// Drag to close the launcher. IN_PROC_BROWSER_TEST_P(LauncherDragTest, Close) {
// TODO(crbug.com/1009459): many of these tests are failing on MSan builds.
#if defined(MEMORY_SANITIZER)
#define MAYBE_Close DISABLED_Close
#else
#define MAYBE_Close Close
#endif
IN_PROC_BROWSER_TEST_P(LauncherDragTest, MAYBE_Close) {
BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser()); BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser());
aura::Window* browser_window = browser_view->GetWidget()->GetNativeWindow(); aura::Window* browser_window = browser_view->GetWidget()->GetNativeWindow();
ash::ShellTestApi shell_test_api; ash::ShellTestApi shell_test_api;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment