Commit a5b291ae authored by Peter Kasting's avatar Peter Kasting Committed by Commit Bot

Enable various disabled tests.

Bug: 431427, 820435, 828063, 863296
Change-Id: I40b7b8129ebc72b3798f5d360e4ed2fa933847c7
Reviewed-on: https://chromium-review.googlesource.com/c/1483677Reviewed-by: default avatarBret Sepulveda <bsep@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#635216}
parent 61515bd2
...@@ -527,14 +527,7 @@ class BookmarkBarViewTest2 : public BookmarkBarViewEventTestBase { ...@@ -527,14 +527,7 @@ class BookmarkBarViewTest2 : public BookmarkBarViewEventTestBase {
} }
}; };
#if defined(OS_WIN) VIEW_TEST(BookmarkBarViewTest2, HideOnDesktopClick)
// Disable this test on Win10: http://crbug.com/828063
#define MAYBE_HideOnDesktopClick DISABLED_HideOnDesktopClick
#else
#define MAYBE_HideOnDesktopClick HideOnDesktopClick
#endif
VIEW_TEST(BookmarkBarViewTest2, MAYBE_HideOnDesktopClick)
// Brings up menu. Moves over child to make sure submenu appears, moves over // Brings up menu. Moves over child to make sure submenu appears, moves over
// another child and make sure next menu appears. // another child and make sure next menu appears.
...@@ -1088,14 +1081,7 @@ class BookmarkBarViewTest9 : public BookmarkBarViewEventTestBase { ...@@ -1088,14 +1081,7 @@ class BookmarkBarViewTest9 : public BookmarkBarViewEventTestBase {
views::MenuItemView* first_menu_; views::MenuItemView* first_menu_;
}; };
// Fails on official cros bot. crbug.com/431427. VIEW_TEST(BookmarkBarViewTest9, ScrollButtonScrolls)
#if defined(OS_CHROMEOS) && defined(OFFICIAL_BUILD)
#define MAYBE_ScrollButtonScrolls DISABLED_ScrollButtonScrolls
#else
#define MAYBE_ScrollButtonScrolls ScrollButtonScrolls
#endif
VIEW_TEST(BookmarkBarViewTest9, MAYBE_ScrollButtonScrolls)
// Tests up/down/left/enter key messages. // Tests up/down/left/enter key messages.
class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase { class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase {
...@@ -1296,8 +1282,6 @@ VIEW_TEST(BookmarkBarViewTest11, CloseMenuAfterClosingContextMenu) ...@@ -1296,8 +1282,6 @@ VIEW_TEST(BookmarkBarViewTest11, CloseMenuAfterClosingContextMenu)
class BookmarkBarViewTest12 : public BookmarkBarViewEventTestBase { class BookmarkBarViewTest12 : public BookmarkBarViewEventTestBase {
protected: protected:
void DoTestOnMessageLoop() override { void DoTestOnMessageLoop() override {
base::RunLoop().RunUntilIdle();
// Open up the other folder. // Open up the other folder.
views::LabelButton* button = bb_view_->other_bookmarks_button(); views::LabelButton* button = bb_view_->other_bookmarks_button();
ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT, ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
...@@ -1699,8 +1683,7 @@ class BookmarkBarViewTest17 : public BookmarkBarViewEventTestBase { ...@@ -1699,8 +1683,7 @@ class BookmarkBarViewTest17 : public BookmarkBarViewEventTestBase {
std::unique_ptr<BookmarkContextMenuNotificationObserver> observer_; std::unique_ptr<BookmarkContextMenuNotificationObserver> observer_;
}; };
// Flaky. See http://crbug.com/820435. VIEW_TEST(BookmarkBarViewTest17, ContextMenus3)
VIEW_TEST(BookmarkBarViewTest17, DISABLED_ContextMenus3)
// Verifies sibling menus works. Clicks on the 'other bookmarks' folder, then // Verifies sibling menus works. Clicks on the 'other bookmarks' folder, then
// moves the mouse over the first item on the bookmark bar and makes sure the // moves the mouse over the first item on the bookmark bar and makes sure the
...@@ -2230,7 +2213,6 @@ class BookmarkBarViewTest25 : public BookmarkBarViewEventTestBase { ...@@ -2230,7 +2213,6 @@ class BookmarkBarViewTest25 : public BookmarkBarViewEventTestBase {
ui_test_utils::MoveMouseToCenterAndPress( ui_test_utils::MoveMouseToCenterAndPress(
button, ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP, button, ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP,
CreateEventTask(this, &BookmarkBarViewTest25::Step2)); CreateEventTask(this, &BookmarkBarViewTest25::Step2));
base::RunLoop().RunUntilIdle();
} }
private: private:
...@@ -2273,7 +2255,6 @@ class BookmarkBarViewTest26 : public BookmarkBarViewEventTestBase { ...@@ -2273,7 +2255,6 @@ class BookmarkBarViewTest26 : public BookmarkBarViewEventTestBase {
ui_test_utils::MoveMouseToCenterAndPress( ui_test_utils::MoveMouseToCenterAndPress(
button, ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP, button, ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP,
CreateEventTask(this, &BookmarkBarViewTest26::Step2)); CreateEventTask(this, &BookmarkBarViewTest26::Step2));
base::RunLoop().RunUntilIdle();
} }
private: private:
......
...@@ -487,10 +487,4 @@ void MenuViewDragAndDropForDropCancel::DoTestWithMenuOpen() { ...@@ -487,10 +487,4 @@ void MenuViewDragAndDropForDropCancel::DoTestWithMenuOpen() {
// Test that if a menu is opened for a drop handled entirely by menu code, the // Test that if a menu is opened for a drop handled entirely by menu code, the
// menu will try to close if it does not receive any drag updates. // menu will try to close if it does not receive any drag updates.
// Disabled for being flaky. Tracked in http://crbug.com/863296. VIEW_TEST(MenuViewDragAndDropForDropCancel, MenuViewCancelsForOwnDrag)
#if defined(OS_MACOSX)
#define MAYBE_MenuViewCancelsForOwnDrag DISABLED_MenuViewCancelsForOwnDrag
#else
#define MAYBE_MenuViewCancelsForOwnDrag MenuViewCancelsForOwnDrag
#endif
VIEW_TEST(MenuViewDragAndDropForDropCancel, MAYBE_MenuViewCancelsForOwnDrag)
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