diff options
| -rw-r--r-- | mash/wm/window_manager_apptest.cc | 3 | ||||
| -rw-r--r-- | mojo/tools/data/apptests | 13 |
2 files changed, 7 insertions, 9 deletions
diff --git a/mash/wm/window_manager_apptest.cc b/mash/wm/window_manager_apptest.cc index 079af7b..5e235fc 100644 --- a/mash/wm/window_manager_apptest.cc +++ b/mash/wm/window_manager_apptest.cc @@ -46,8 +46,7 @@ class WindowManagerAppTest : public mojo::test::ApplicationTestBase, DISALLOW_COPY_AND_ASSIGN(WindowManagerAppTest); }; -// TODO(sky): flakey, http://crbug.com/559412 . -TEST_F(WindowManagerAppTest, DISABLED_OpenWindow) { +TEST_F(WindowManagerAppTest, OpenWindow) { mus::mojom::WindowManagerPtr connection; ConnectToWindowManager(&connection); diff --git a/mojo/tools/data/apptests b/mojo/tools/data/apptests index 27b077a..8c7c37f 100644 --- a/mojo/tools/data/apptests +++ b/mojo/tools/data/apptests @@ -76,13 +76,12 @@ if config.target_os != config.OS_ANDROID: 'test': 'mojo:mandoline_browser_apptests', 'type': 'gtest_isolated', }, - # TODO(sky): flakey, http://crbug.com/559412 . - # { - # 'test': 'mojo:mash_wm_apptests', - # 'type': 'gtest_isolated', - # 'args': ['--use-x11-test-config', - # '--override-use-gl-with-osmesa-for-tests'] - # }, + { + 'test': 'mojo:mash_wm_apptests', + 'type': 'gtest_isolated', + 'args': ['--use-x11-test-config', + '--override-use-gl-with-osmesa-for-tests'] + }, # TODO(xhwang): Fix and enable mojo:media_pipeline_integration_apptests. # http://crbug.com/501417 { |