Skip to content

GitLab

T
tangled
Commit 9cf551dd authored by Gang Wu's avatar Gang Wu Committed by Commit Bot
Browse files
Options

Revert "Enable interactive uitests on Mac" 

This reverts commit 7188deb6.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> Enable interactive uitests on Mac
> 
> Re-enable interactive uitests that were disabled for crbug/823543
> and crbug/824418. These issues are because of crbug/641969 which is
> no longer reproduced on MacViews browser.
> 
> BUG=823543, 824418, 641969
> 
> Change-Id: Id5de29e9d95962f98748d140469f4709fcbd4fb9
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1699665
> Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
> Reviewed-by: Scott Violet <sky@chromium.org>
> Reviewed-by: Robert Liao <robliao@chromium.org>
> Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#683998}

TBR=ellyjones@chromium.org,sky@chromium.org,robliao@chromium.org,jongkwon.lee@navercorp.com

Change-Id: I5fa5df976a6ad68618dd43951637e6b15d276eb6
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 823543, 824418, 641969
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1737095Reviewed-by: default avatarGang Wu <gangwu@chromium.org>
Commit-Queue: Gang Wu <gangwu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#684047}
parent b300611c
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 22 deletions
chrome/browser/ui/cocoa/status_bubble_mac_interactive_uitest.mm
View file @ 9cf551dd
...@@ -17,11 +17,8 @@ class StatusBubbleMacInteractiveUITest : public InProcessBrowserTest { ...@@ -17,11 +17,8 @@ class StatusBubbleMacInteractiveUITest : public InProcessBrowserTest {
StatusBubbleMacInteractiveUITest() {} StatusBubbleMacInteractiveUITest() {}
}; };
// interactive_ui_tests brings browser window to front using
// ui_test_utils::BringBrowserWindowToFront, which cause NSApp hide: and unhide:
// do not work properly.
IN_PROC_BROWSER_TEST_F(StatusBubbleMacInteractiveUITest, IN_PROC_BROWSER_TEST_F(StatusBubbleMacInteractiveUITest,
DISABLED_TestSettingStatusDoesNotUnhideApp) { TestSettingStatusDoesNotUnhideApp) {
StatusBubble* status_bubble = browser()->window()->GetStatusBubble(); StatusBubble* status_bubble = browser()->window()->GetStatusBubble();
EXPECT_FALSE(NSApp.hidden); EXPECT_FALSE(NSApp.hidden);
......
chrome/browser/ui/views/keyboard_access_browsertest.cc
View file @ 9cf551dd
...@@ -449,12 +449,18 @@ IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, TestMenuKeyboardOpenDismiss) { ...@@ -449,12 +449,18 @@ IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, TestMenuKeyboardOpenDismiss) {
} }
#endif #endif
#if defined(OS_MACOSX)
// Focusing or input is not completely working on Mac: http://crbug.com/824418
#define MAYBE_ReserveKeyboardAccelerators DISABLED_ReserveKeyboardAccelerators
#else
#define MAYBE_ReserveKeyboardAccelerators ReserveKeyboardAccelerators
#endif
// Test that JavaScript cannot intercept reserved keyboard accelerators like // Test that JavaScript cannot intercept reserved keyboard accelerators like
// ctrl-t to open a new tab or ctrl-f4 to close a tab. // ctrl-t to open a new tab or ctrl-f4 to close a tab.
// TODO(isherman): This test times out on ChromeOS. We should merge it with // TODO(isherman): This test times out on ChromeOS. We should merge it with
// BrowserKeyEventsTest.ReservedAccelerators, but just disable for now. // BrowserKeyEventsTest.ReservedAccelerators, but just disable for now.
// If this flakes, use http://crbug.com/62311. // If this flakes, use http://crbug.com/62311.
IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, ReserveKeyboardAccelerators) { IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, MAYBE_ReserveKeyboardAccelerators) {
const std::string kBadPage = const std::string kBadPage =
"<html><script>" "<html><script>"
"document.onkeydown = function() {" "document.onkeydown = function() {"
...@@ -477,11 +483,7 @@ IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, ReserveKeyboardAccelerators) { ...@@ -477,11 +483,7 @@ IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, ReserveKeyboardAccelerators) {
ASSERT_EQ(2, browser()->tab_strip_model()->active_index()); ASSERT_EQ(2, browser()->tab_strip_model()->active_index());
ASSERT_TRUE(ui_test_utils::SendKeyPressSync( ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
#if defined(OS_MACOSX)
browser(), ui::VKEY_W, false, false, false, true));
#else
browser(), ui::VKEY_W, true, false, false, false)); browser(), ui::VKEY_W, true, false, false, false));
#endif
ASSERT_EQ(0, browser()->tab_strip_model()->active_index()); ASSERT_EQ(0, browser()->tab_strip_model()->active_index());
} }
......
chrome/browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc
View file @ 9cf551dd
...@@ -25,8 +25,15 @@ class LocationIconViewTest : public InProcessBrowserTest { ...@@ -25,8 +25,15 @@ class LocationIconViewTest : public InProcessBrowserTest {
DISALLOW_COPY_AND_ASSIGN(LocationIconViewTest); DISALLOW_COPY_AND_ASSIGN(LocationIconViewTest);
}; };
#if defined(OS_MACOSX)
// TODO(robliao): https://crbug.com/824418 Focusing or input is not completely
// working on Mac.
#define MAYBE_HideOnSecondClick DISABLED_HideOnSecondClick
#else
#define MAYBE_HideOnSecondClick HideOnSecondClick
#endif
// Verify that clicking the location icon a second time hides the bubble. // Verify that clicking the location icon a second time hides the bubble.
IN_PROC_BROWSER_TEST_F(LocationIconViewTest, HideOnSecondClick) { IN_PROC_BROWSER_TEST_F(LocationIconViewTest, MAYBE_HideOnSecondClick) {
BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser()); BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser());
views::View* location_icon_view = views::View* location_icon_view =
browser_view->toolbar()->location_bar()->location_icon_view(); browser_view->toolbar()->location_bar()->location_icon_view();
...@@ -56,8 +63,8 @@ IN_PROC_BROWSER_TEST_F(LocationIconViewTest, HideOnSecondClick) { ...@@ -56,8 +63,8 @@ IN_PROC_BROWSER_TEST_F(LocationIconViewTest, HideOnSecondClick) {
} }
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
// TODO(jongkwon.lee): https://crbug.com/825834 NativeWidgetMac::Deactivate is // TODO(robliao): https://crbug.com/823543 Widget activation doesn't work on
// not implemented on Mac. // Mac.
#define MAYBE_ActivateFirstInactiveBubbleForAccessibility \ #define MAYBE_ActivateFirstInactiveBubbleForAccessibility \
DISABLED_ActivateFirstInactiveBubbleForAccessibility DISABLED_ActivateFirstInactiveBubbleForAccessibility
#else #else
......
chrome/browser/ui/views/location_bar/star_view_browsertest.cc
View file @ 9cf551dd
...@@ -44,7 +44,14 @@ class StarViewTest : public InProcessBrowserTest { ...@@ -44,7 +44,14 @@ class StarViewTest : public InProcessBrowserTest {
// Verify that clicking the bookmark star a second time hides the bookmark // Verify that clicking the bookmark star a second time hides the bookmark
// bubble. // bubble.
IN_PROC_BROWSER_TEST_F(StarViewTest, HideOnSecondClick) { #if defined(OS_MACOSX)
// TODO(robliao): https://crbug.com/824418 Focusing or input is not completely
// working on Mac.
#define MAYBE_HideOnSecondClick DISABLED_HideOnSecondClick
#else
#define MAYBE_HideOnSecondClick HideOnSecondClick
#endif
IN_PROC_BROWSER_TEST_F(StarViewTest, MAYBE_HideOnSecondClick) {
BrowserView* browser_view = BrowserView* browser_view =
reinterpret_cast<BrowserView*>(browser()->window()); reinterpret_cast<BrowserView*>(browser()->window());
views::View* star_view = browser_view->toolbar()->location_bar()->star_view(); views::View* star_view = browser_view->toolbar()->location_bar()->star_view();
......
chrome/browser/ui/views/sad_tab_view_interactive_uitest.cc
View file @ 9cf551dd
...@@ -166,7 +166,10 @@ IN_PROC_BROWSER_TEST_F(SadTabViewInteractiveUITest, ...@@ -166,7 +166,10 @@ IN_PROC_BROWSER_TEST_F(SadTabViewInteractiveUITest,
ASSERT_TRUE(IsFocusedViewInsideBrowserToolbar()); ASSERT_TRUE(IsFocusedViewInsideBrowserToolbar());
} }
#if defined(OS_WIN) && defined(OFFICIAL_BUILD) #if defined(OS_MACOSX)
// Focusing or input is not completely working on Mac: http://crbug.com/824418
#define MAYBE_ReloadMultipleSadTabs DISABLED_ReloadMultipleSadTabs
#elif defined(OS_WIN) && defined(OFFICIAL_BUILD)
// Test seems to fail only in official Windows builds: http://crbug.com/848049 // Test seems to fail only in official Windows builds: http://crbug.com/848049
#define MAYBE_ReloadMultipleSadTabs DISABLED_ReloadMultipleSadTabs #define MAYBE_ReloadMultipleSadTabs DISABLED_ReloadMultipleSadTabs
#else #else
......
chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc
View file @ 9cf551dd
...@@ -278,7 +278,13 @@ IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, SelectNone) { ...@@ -278,7 +278,13 @@ IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, SelectNone) {
// Let the mock get checked on destruction. // Let the mock get checked on destruction.
} }
IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, Escape) { #if defined(OS_MACOSX)
// Focusing or input is not completely working on Mac: http://crbug.com/824418
#define MAYBE_Escape DISABLED_Escape
#else
#define MAYBE_Escape Escape
#endif
IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, MAYBE_Escape) {
base::HistogramTester histograms; base::HistogramTester histograms;
EXPECT_CALL(*auth_requestor_.get(), CertificateSelected(nullptr, nullptr)); EXPECT_CALL(*auth_requestor_.get(), CertificateSelected(nullptr, nullptr));
...@@ -318,7 +324,7 @@ IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, CloseTab) { ...@@ -318,7 +324,7 @@ IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, CloseTab) {
Mock::VerifyAndClear(auth_requestor_.get()); Mock::VerifyAndClear(auth_requestor_.get());
} }
IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiTabTest, Escape) { IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiTabTest, MAYBE_Escape) {
// auth_requestor_1_ should get selected automatically by the // auth_requestor_1_ should get selected automatically by the
// SSLClientAuthObserver when selector_2_ is accepted, since both 1 & 2 have // SSLClientAuthObserver when selector_2_ is accepted, since both 1 & 2 have
// the same host:port. // the same host:port.
...@@ -373,7 +379,14 @@ IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiTabTest, SelectSecond) { ...@@ -373,7 +379,14 @@ IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiTabTest, SelectSecond) {
EXPECT_CALL(*auth_requestor_.get(), CancelCertificateSelection()); EXPECT_CALL(*auth_requestor_.get(), CancelCertificateSelection());
} }
IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiProfileTest, Escape) { #if defined(OS_MACOSX)
// Widget activation doesn't work on Mac: https://crbug.com/823543
#define MAYBE_Escape DISABLED_Escape
#else
#define MAYBE_Escape Escape
#endif
IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiProfileTest,
MAYBE_Escape) {
EXPECT_CALL(*auth_requestor_1_.get(), CertificateSelected(nullptr, nullptr)); EXPECT_CALL(*auth_requestor_1_.get(), CertificateSelected(nullptr, nullptr));
EXPECT_TRUE(ui_test_utils::SendKeyPressSync( EXPECT_TRUE(ui_test_utils::SendKeyPressSync(
...@@ -387,8 +400,14 @@ IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiProfileTest, Escape) { ...@@ -387,8 +400,14 @@ IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiProfileTest, Escape) {
EXPECT_CALL(*auth_requestor_.get(), CancelCertificateSelection()); EXPECT_CALL(*auth_requestor_.get(), CancelCertificateSelection());
} }
#if defined(OS_MACOSX)
// Widget activation doesn't work on Mac: https://crbug.com/823543
#define MAYBE_SelectDefault DISABLED_SelectDefault
#else
#define MAYBE_SelectDefault SelectDefault
#endif
IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiProfileTest, IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiProfileTest,
SelectDefault) { MAYBE_SelectDefault) {
EXPECT_CALL(*auth_requestor_1_.get(), EXPECT_CALL(*auth_requestor_1_.get(),
CertificateSelected(cert_identity_1_->certificate(), CertificateSelected(cert_identity_1_->certificate(),
cert_identity_1_->ssl_private_key())); cert_identity_1_->ssl_private_key()));
......
chrome/browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc
View file @ 9cf551dd
...@@ -311,8 +311,15 @@ IN_PROC_BROWSER_TEST_F(ToolbarActionViewInteractiveUITest, ...@@ -311,8 +311,15 @@ IN_PROC_BROWSER_TEST_F(ToolbarActionViewInteractiveUITest,
// Tests that clicking on the toolbar action a second time when the action is // Tests that clicking on the toolbar action a second time when the action is
// already open results in closing the popup, and doesn't re-open it. // already open results in closing the popup, and doesn't re-open it.
#if defined(OS_MACOSX)
// Focusing or input is not completely working on Mac: http://crbug.com/824418
#define MAYBE_DoubleClickToolbarActionToClose \
DISABLED_DoubleClickToolbarActionToClose
#else
#define MAYBE_DoubleClickToolbarActionToClose DoubleClickToolbarActionToClose
#endif
IN_PROC_BROWSER_TEST_F(ToolbarActionViewInteractiveUITest, IN_PROC_BROWSER_TEST_F(ToolbarActionViewInteractiveUITest,
DoubleClickToolbarActionToClose) { MAYBE_DoubleClickToolbarActionToClose) {
ASSERT_TRUE(LoadExtension( ASSERT_TRUE(LoadExtension(
test_data_dir_.AppendASCII("ui").AppendASCII("browser_action_popup"))); test_data_dir_.AppendASCII("ui").AppendASCII("browser_action_popup")));
base::RunLoop().RunUntilIdle(); // Ensure the extension is fully loaded. base::RunLoop().RunUntilIdle(); // Ensure the extension is fully loaded.
......
chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc
View file @ 9cf551dd
...@@ -139,7 +139,14 @@ void ToolbarViewInteractiveUITest::SetUpOnMainThread() { ...@@ -139,7 +139,14 @@ void ToolbarViewInteractiveUITest::SetUpOnMainThread() {
ToolbarActionsBar::disable_animations_for_testing_ = true; ToolbarActionsBar::disable_animations_for_testing_ = true;
} }
IN_PROC_BROWSER_TEST_F(ToolbarViewInteractiveUITest, TestAppMenuOpensOnDrag) { // TODO(pkasting): https://crbug.com/939621 Fails on Mac.
#if defined(OS_MACOSX)
#define MAYBE_TestAppMenuOpensOnDrag DISABLED_TestAppMenuOpensOnDrag
#else
#define MAYBE_TestAppMenuOpensOnDrag TestAppMenuOpensOnDrag
#endif
IN_PROC_BROWSER_TEST_F(ToolbarViewInteractiveUITest,
MAYBE_TestAppMenuOpensOnDrag) {
// Load an extension that has a browser action. // Load an extension that has a browser action.
ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test") ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test")
.AppendASCII("browser_action") .AppendASCII("browser_action")
...@@ -269,11 +276,25 @@ void ToolbarViewTest::RunToolbarCycleFocusTest(Browser* browser) { ...@@ -269,11 +276,25 @@ void ToolbarViewTest::RunToolbarCycleFocusTest(Browser* browser) {
EXPECT_EQ(ids[i], reverse_ids[count - 2 - i]); EXPECT_EQ(ids[i], reverse_ids[count - 2 - i]);
} }
IN_PROC_BROWSER_TEST_F(ToolbarViewTest, ToolbarCycleFocus) { #if defined(OS_MACOSX)
// Widget activation doesn't work on Mac: https://crbug.com/823543
#define MAYBE_ToolbarCycleFocus DISABLED_ToolbarCycleFocus
#else
#define MAYBE_ToolbarCycleFocus ToolbarCycleFocus
#endif
IN_PROC_BROWSER_TEST_F(ToolbarViewTest, MAYBE_ToolbarCycleFocus) {
RunToolbarCycleFocusTest(browser()); RunToolbarCycleFocusTest(browser());
} }
IN_PROC_BROWSER_TEST_F(ToolbarViewTest, ToolbarCycleFocusWithBookmarkBar) { #if defined(OS_MACOSX)
// Widget activation doesn't work on Mac: https://crbug.com/823543
#define MAYBE_ToolbarCycleFocusWithBookmarkBar \
DISABLED_ToolbarCycleFocusWithBookmarkBar
#else
#define MAYBE_ToolbarCycleFocusWithBookmarkBar ToolbarCycleFocusWithBookmarkBar
#endif
IN_PROC_BROWSER_TEST_F(ToolbarViewTest,
MAYBE_ToolbarCycleFocusWithBookmarkBar) {
CommandUpdater* updater = browser()->command_controller(); CommandUpdater* updater = browser()->command_controller();
updater->ExecuteCommand(IDC_SHOW_BOOKMARK_BAR); updater->ExecuteCommand(IDC_SHOW_BOOKMARK_BAR);
......
chrome/test/base/interactive_ui_tests_main.cc
View file @ 9cf551dd
...@@ -142,6 +142,9 @@ int main(int argc, char** argv) { ...@@ -142,6 +142,9 @@ int main(int argc, char** argv) {
switches::kOverrideUseSoftwareGLForTests); switches::kOverrideUseSoftwareGLForTests);
#endif #endif
// TODO(sky): this causes a crash in an autofill test on macosx, figure out
// why: http://crbug.com/641969.
#if !defined(OS_MACOSX)
// Without this it's possible for the first browser to start up in the // Without this it's possible for the first browser to start up in the
// background, generally because the last test did something that causes the // background, generally because the last test did something that causes the
// test to run in the background. Most interactive ui tests assume they are in // test to run in the background. Most interactive ui tests assume they are in
...@@ -150,6 +153,7 @@ int main(int argc, char** argv) { ...@@ -150,6 +153,7 @@ int main(int argc, char** argv) {
// foreground. // foreground.
InProcessBrowserTest::set_global_browser_set_up_function( InProcessBrowserTest::set_global_browser_set_up_function(
&ui_test_utils::BringBrowserWindowToFront); &ui_test_utils::BringBrowserWindowToFront);
#endif
// Run interactive_ui_tests serially, they do not support running in parallel. // Run interactive_ui_tests serially, they do not support running in parallel.
size_t parallel_jobs = 1U; size_t parallel_jobs = 1U;
......
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