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

Make property manager tests interactive UI tests and re-enable.

The theory is that these are flaky because they're reading/writing app-global
properties while other tests may be changing them.  By making them interactive,
this flakiness ought to go away.

Bug: 396344
Change-Id: I1a695ffc9581d2f8193445d95d56d30d83fc0bf3
Reviewed-on: https://chromium-review.googlesource.com/c/1410504Reviewed-by: default avatarBret Sepulveda <bsep@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#622984}
parent 386c3121
...@@ -161,9 +161,8 @@ class BrowserTestWithProfileShortcutManager : public InProcessBrowserTest { ...@@ -161,9 +161,8 @@ class BrowserTestWithProfileShortcutManager : public InProcessBrowserTest {
}; };
// Check that the window properties on Windows are properly set. // Check that the window properties on Windows are properly set.
// TODO(crbug.com/915984): This test is flaky.
IN_PROC_BROWSER_TEST_F(BrowserTestWithProfileShortcutManager, IN_PROC_BROWSER_TEST_F(BrowserTestWithProfileShortcutManager,
DISABLED_WindowProperties) { WindowProperties) {
// Single profile case. The profile name should not be shown. // Single profile case. The profile name should not be shown.
ValidateBrowserWindowProperties(browser(), base::string16()); ValidateBrowserWindowProperties(browser(), base::string16());
...@@ -193,8 +192,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTestWithProfileShortcutManager, ...@@ -193,8 +192,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTestWithProfileShortcutManager,
ValidateBrowserWindowProperties(profile2_browser, entry->GetName()); ValidateBrowserWindowProperties(profile2_browser, entry->GetName());
} }
// TODO(crbug.com/919760): This test is flaky. IN_PROC_BROWSER_TEST_F(BrowserWindowPropertyManagerTest, HostedApp) {
IN_PROC_BROWSER_TEST_F(BrowserWindowPropertyManagerTest, DISABLED_HostedApp) {
// Load an app. // Load an app.
const extensions::Extension* extension = const extensions::Extension* extension =
LoadExtension(test_data_dir_.AppendASCII("app/")); LoadExtension(test_data_dir_.AppendASCII("app/"));
......
...@@ -1550,7 +1550,6 @@ test("browser_tests") { ...@@ -1550,7 +1550,6 @@ test("browser_tests") {
"../browser/ui/views/frame/browser_non_client_frame_view_browsertest.cc", "../browser/ui/views/frame/browser_non_client_frame_view_browsertest.cc",
"../browser/ui/views/frame/browser_root_view_browsertest.cc", "../browser/ui/views/frame/browser_root_view_browsertest.cc",
"../browser/ui/views/frame/browser_view_browsertest.cc", "../browser/ui/views/frame/browser_view_browsertest.cc",
"../browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc",
"../browser/ui/views/frame/glass_browser_frame_view_browsertest_win.cc", "../browser/ui/views/frame/glass_browser_frame_view_browsertest_win.cc",
"../browser/ui/views/hung_renderer_view_browsertest.cc", "../browser/ui/views/hung_renderer_view_browsertest.cc",
"../browser/ui/views/importer/import_lock_dialog_view_browsertest.cc", "../browser/ui/views/importer/import_lock_dialog_view_browsertest.cc",
...@@ -4921,6 +4920,7 @@ if (!is_android) { ...@@ -4921,6 +4920,7 @@ if (!is_android) {
"../browser/ui/views/find_bar_views_interactive_uitest.cc", "../browser/ui/views/find_bar_views_interactive_uitest.cc",
"../browser/ui/views/frame/browser_view_focus_uitest.cc", "../browser/ui/views/frame/browser_view_focus_uitest.cc",
"../browser/ui/views/frame/browser_view_interactive_uitest.cc", "../browser/ui/views/frame/browser_view_interactive_uitest.cc",
"../browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc",
"../browser/ui/views/fullscreen_control/fullscreen_control_view_interactive_uitest.cc", "../browser/ui/views/fullscreen_control/fullscreen_control_view_interactive_uitest.cc",
"../browser/ui/views/keyboard_access_browsertest.cc", "../browser/ui/views/keyboard_access_browsertest.cc",
"../browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc", "../browser/ui/views/location_bar/location_icon_view_interactive_uitest.cc",
......
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