Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(235)

Unified Diff: components/mus/ws/window_tree_client_unittest.cc

Issue 1848693004: Disable WindowTreeClientTest.WindowsRemovedWhenEmbedding on win due to flakes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/ws/window_tree_client_unittest.cc
diff --git a/components/mus/ws/window_tree_client_unittest.cc b/components/mus/ws/window_tree_client_unittest.cc
index c2fe5932ffd2c62254d326d75bc22741651d60cd..bc7a234fd6b088f6fb100576bbd14fa4f685091d 100644
--- a/components/mus/ws/window_tree_client_unittest.cc
+++ b/components/mus/ws/window_tree_client_unittest.cc
@@ -619,8 +619,15 @@ TEST_F(WindowTreeClientTest, TwoClientsGetDifferentConnectionIds) {
ASSERT_NE(connection_id_1(), connection_id_2());
}
+// Disabled due to flakes on win8_chromium_ng; see https://crbug.com/598925.
+#if defined(OS_WIN)
+#define MAYBE_WindowsRemovedWhenEmbedding \
+ DISABLED_WindowsRemovedWhenEmbedding
+#else
+#define MAYBE_WindowsRemovedWhenEmbedding WindowsRemovedWhenEmbedding
+#endif
// Verifies when Embed() is invoked any child windows are removed.
-TEST_F(WindowTreeClientTest, WindowsRemovedWhenEmbedding) {
+TEST_F(WindowTreeClientTest, MAYBE_WindowsRemovedWhenEmbedding) {
// Two windows 1 and 2. 2 is parented to 1.
Id window_1_1 = wt_client1()->NewWindow(1);
ASSERT_TRUE(window_1_1);
@@ -1701,14 +1708,7 @@ TEST_F(WindowTreeClientTest, EmbedSupplyingWindowTreeClient) {
SingleChangeToDescription(*client2.tracker()->changes()));
}
-// Disabled due to flakes on win8_chromium_ng; see https://crbug.com/598925.
-#if defined(OS_WIN)
-#define MAYBE_EmbedFailsFromOtherConnection \
- DISABLED_EmbedFailsFromOtherConnection
-#else
-#define MAYBE_EmbedFailsFromOtherConnection EmbedFailsFromOtherConnection
-#endif
-TEST_F(WindowTreeClientTest, MAYBE_EmbedFailsFromOtherConnection) {
+TEST_F(WindowTreeClientTest, EmbedFailsFromOtherConnection) {
ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
Id window_1_1 = BuildWindowId(connection_id_1(), 1);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698