Index: mojo/edk/system/multiprocess_message_pipe_unittest.cc |
diff --git a/mojo/edk/system/multiprocess_message_pipe_unittest.cc b/mojo/edk/system/multiprocess_message_pipe_unittest.cc |
index 1d07d0f650af6ac1634813f85f9332af6e5792ec..946322c9b97de509f7286f9fc8812c3aaad9db56 100644 |
--- a/mojo/edk/system/multiprocess_message_pipe_unittest.cc |
+++ b/mojo/edk/system/multiprocess_message_pipe_unittest.cc |
@@ -115,14 +115,7 @@ DEFINE_TEST_CLIENT_WITH_PIPE(EchoEcho, MultiprocessMessagePipeTest, h) { |
return rv; |
} |
-// Sends "hello" to child, and expects "hellohello" back. |
-#if defined(OS_ANDROID) |
-// Android multi-process tests are not executing the new process. This is flaky. |
-#define MAYBE_Basic DISABLED_Basic |
-#else |
-#define MAYBE_Basic Basic |
-#endif // defined(OS_ANDROID) |
-TEST_F(MultiprocessMessagePipeTest, MAYBE_Basic) { |
+TEST_F(MultiprocessMessagePipeTest, Basic) { |
RUN_CHILD_ON_PIPE(EchoEcho, h) |
std::string hello("hello"); |
ASSERT_EQ(MOJO_RESULT_OK, |
@@ -158,15 +151,7 @@ TEST_F(MultiprocessMessagePipeTest, MAYBE_Basic) { |
END_CHILD_AND_EXPECT_EXIT_CODE(1 % 100); |
} |
-// Sends a bunch of messages to the child. Expects them "repeated" back. Waits |
-// for the child to close its end before quitting. |
-#if defined(OS_ANDROID) |
-// Android multi-process tests are not executing the new process. This is flaky. |
-#define MAYBE_QueueMessages DISABLED_QueueMessages |
-#else |
-#define MAYBE_QueueMessages QueueMessages |
-#endif // defined(OS_ANDROID) |
-TEST_F(MultiprocessMessagePipeTest, MAYBE_QueueMessages) { |
+TEST_F(MultiprocessMessagePipeTest, QueueMessages) { |
static const size_t kNumMessages = 1001; |
RUN_CHILD_ON_PIPE(EchoEcho, h) |
for (size_t i = 0; i < kNumMessages; i++) { |
@@ -292,13 +277,7 @@ DEFINE_TEST_CLIENT_WITH_PIPE(CheckSharedBuffer, MultiprocessMessagePipeTest, |
return 0; |
} |
-#if defined(OS_ANDROID) |
-// Android multi-process tests are not executing the new process. This is flaky. |
-#define MAYBE_SharedBufferPassing DISABLED_SharedBufferPassing |
-#else |
-#define MAYBE_SharedBufferPassing SharedBufferPassing |
-#endif |
-TEST_F(MultiprocessMessagePipeTest, MAYBE_SharedBufferPassing) { |
+TEST_F(MultiprocessMessagePipeTest, SharedBufferPassing) { |
RUN_CHILD_ON_PIPE(CheckSharedBuffer, h) |
// Make a shared buffer. |
MojoCreateSharedBufferOptions options; |
@@ -529,13 +508,7 @@ DEFINE_TEST_CLIENT_WITH_PIPE(CheckMessagePipe, MultiprocessMessagePipeTest, h) { |
return 0; |
} |
-#if defined(OS_ANDROID) |
-// Android multi-process tests are not executing the new process. This is flaky. |
-#define MAYBE_MessagePipePassing DISABLED_MessagePipePassing |
-#else |
-#define MAYBE_MessagePipePassing MessagePipePassing |
-#endif |
-TEST_F(MultiprocessMessagePipeTest, MAYBE_MessagePipePassing) { |
+TEST_F(MultiprocessMessagePipeTest, MessagePipePassing) { |
RUN_CHILD_ON_PIPE(CheckMessagePipe, h) |
MojoCreateSharedBufferOptions options; |
options.struct_size = sizeof(options); |
@@ -577,14 +550,7 @@ TEST_F(MultiprocessMessagePipeTest, MAYBE_MessagePipePassing) { |
END_CHILD() |
} |
-// Like above test, but verifies passing the other MP handle works as well. |
-#if defined(OS_ANDROID) |
-// Android multi-process tests are not executing the new process. This is flaky. |
-#define MAYBE_MessagePipeTwoPassing DISABLED_MessagePipeTwoPassing |
-#else |
-#define MAYBE_MessagePipeTwoPassing MessagePipeTwoPassing |
-#endif |
-TEST_F(MultiprocessMessagePipeTest, MAYBE_MessagePipeTwoPassing) { |
+TEST_F(MultiprocessMessagePipeTest, MessagePipeTwoPassing) { |
RUN_CHILD_ON_PIPE(CheckMessagePipe, h) |
MojoHandle mp1, mp2; |
ASSERT_EQ(MOJO_RESULT_OK, |
@@ -672,13 +638,7 @@ DEFINE_TEST_CLIENT_WITH_PIPE(DataPipeConsumer, MultiprocessMessagePipeTest, h) { |
return 0; |
} |
-#if defined(OS_ANDROID) |
-// Android multi-process tests are not executing the new process. This is flaky. |
-#define MAYBE_DataPipeConsumer DISABLED_DataPipeConsumer |
-#else |
-#define MAYBE_DataPipeConsumer DataPipeConsumer |
-#endif |
-TEST_F(MultiprocessMessagePipeTest, MAYBE_DataPipeConsumer) { |
+TEST_F(MultiprocessMessagePipeTest, DataPipeConsumer) { |
RUN_CHILD_ON_PIPE(DataPipeConsumer, h) |
MojoCreateSharedBufferOptions options; |
options.struct_size = sizeof(options); |
@@ -772,13 +732,7 @@ DEFINE_TEST_CLIENT_WITH_PIPE(ChannelEchoClient, MultiprocessMessagePipeTest, |
return 0; |
} |
-#if defined(OS_ANDROID) |
-// Android multi-process tests are not executing the new process. This is flaky. |
-#define MAYBE_MultiprocessChannelPipe DISABLED_MultiprocessChannelPipe |
-#else |
-#define MAYBE_MultiprocessChannelPipe MultiprocessChannelPipe |
-#endif |
-TEST_F(MultiprocessMessagePipeTest, MAYBE_MultiprocessChannelPipe) { |
+TEST_F(MultiprocessMessagePipeTest, MultiprocessChannelPipe) { |
RUN_CHILD_ON_PIPE(ChannelEchoClient, h) |
VerifyEcho(h, "in an interstellar burst"); |
VerifyEcho(h, "i am back to save the universe"); |
@@ -803,13 +757,7 @@ DEFINE_TEST_CLIENT_WITH_PIPE(EchoServiceClient, MultiprocessMessagePipeTest, |
return 0; |
} |
-#if defined(OS_ANDROID) |
-// Android multi-process tests are not executing the new process. This is flaky. |
-#define MAYBE_PassMessagePipeCrossProcess DISABLED_PassMessagePipeCrossProcess |
-#else |
-#define MAYBE_PassMessagePipeCrossProcess PassMessagePipeCrossProcess |
-#endif |
-TEST_F(MultiprocessMessagePipeTest, MAYBE_PassMessagePipeCrossProcess) { |
+TEST_F(MultiprocessMessagePipeTest, PassMessagePipeCrossProcess) { |
MojoHandle p0, p1; |
CreateMessagePipe(&p0, &p1); |
RUN_CHILD_ON_PIPE(EchoServiceClient, h) |
@@ -866,14 +814,7 @@ DEFINE_TEST_CLIENT_WITH_PIPE(EchoServiceFactoryClient, |
return 0; |
} |
-#if defined(OS_ANDROID) |
-// Android multi-process tests are not executing the new process. This is flaky. |
-#define MAYBE_PassMoarMessagePipesCrossProcess \ |
- DISABLED_PassMoarMessagePipesCrossProcess |
-#else |
-#define MAYBE_PassMoarMessagePipesCrossProcess PassMoarMessagePipesCrossProcess |
-#endif |
-TEST_F(MultiprocessMessagePipeTest, MAYBE_PassMoarMessagePipesCrossProcess) { |
+TEST_F(MultiprocessMessagePipeTest, PassMoarMessagePipesCrossProcess) { |
MojoHandle echo_factory_proxy, echo_factory_request; |
CreateMessagePipe(&echo_factory_proxy, &echo_factory_request); |
@@ -918,14 +859,7 @@ TEST_F(MultiprocessMessagePipeTest, MAYBE_PassMoarMessagePipesCrossProcess) { |
CloseHandle(echo_proxy_c); |
} |
-#if defined(OS_ANDROID) |
-// Android multi-process tests are not executing the new process. This is flaky. |
-#define MAYBE_ChannelPipesWithMultipleChildren \ |
- DISABLED_ChannelPipesWithMultipleChildren |
-#else |
-#define MAYBE_ChannelPipesWithMultipleChildren ChannelPipesWithMultipleChildren |
-#endif |
-TEST_F(MultiprocessMessagePipeTest, MAYBE_ChannelPipesWithMultipleChildren) { |
+TEST_F(MultiprocessMessagePipeTest, ChannelPipesWithMultipleChildren) { |
RUN_CHILD_ON_PIPE(ChannelEchoClient, a) |
RUN_CHILD_ON_PIPE(ChannelEchoClient, b) |
VerifyEcho(a, "hello child 0"); |
@@ -955,13 +889,7 @@ DEFINE_TEST_CLIENT_TEST_WITH_PIPE(PingPongPipeClient, |
EXPECT_EQ("quit", ReadMessage(h)); |
} |
-#if defined(OS_ANDROID) |
-// Android multi-process tests are not executing the new process. This is flaky. |
-#define MAYBE_PingPongPipe DISABLED_PingPongPipe |
-#else |
-#define MAYBE_PingPongPipe PingPongPipe |
-#endif |
-TEST_F(MultiprocessMessagePipeTest, MAYBE_PingPongPipe) { |
+TEST_F(MultiprocessMessagePipeTest, PingPongPipe) { |
MojoHandle p0, p1; |
CreateMessagePipe(&p0, &p1); |
@@ -1060,13 +988,7 @@ DEFINE_TEST_CLIENT_WITH_PIPE(CommandDrivenClient, MultiprocessMessagePipeTest, |
return 0; |
} |
-#if defined(OS_ANDROID) |
-// Android multi-process tests are not executing the new process. This is flaky. |
-#define MAYBE_ChildToChildPipes DISABLED_ChildToChildPipes |
-#else |
-#define MAYBE_ChildToChildPipes ChildToChildPipes |
-#endif |
-TEST_F(MultiprocessMessagePipeTest, MAYBE_ChildToChildPipes) { |
+TEST_F(MultiprocessMessagePipeTest, ChildToChildPipes) { |
RUN_CHILD_ON_PIPE(CommandDrivenClient, h0) |
RUN_CHILD_ON_PIPE(CommandDrivenClient, h1) |
CommandDrivenClientController a(h0); |
@@ -1091,13 +1013,7 @@ TEST_F(MultiprocessMessagePipeTest, MAYBE_ChildToChildPipes) { |
END_CHILD() |
} |
-#if defined(OS_ANDROID) |
-// Android multi-process tests are not executing the new process. This is flaky. |
-#define MAYBE_MoreChildToChildPipes DISABLED_MoreChildToChildPipes |
-#else |
-#define MAYBE_MoreChildToChildPipes MoreChildToChildPipes |
-#endif |
-TEST_F(MultiprocessMessagePipeTest, MAYBE_MoreChildToChildPipes) { |
+TEST_F(MultiprocessMessagePipeTest, MoreChildToChildPipes) { |
RUN_CHILD_ON_PIPE(CommandDrivenClient, h0) |
RUN_CHILD_ON_PIPE(CommandDrivenClient, h1) |
RUN_CHILD_ON_PIPE(CommandDrivenClient, h2) |
@@ -1183,13 +1099,7 @@ DEFINE_TEST_CLIENT_TEST_WITH_PIPE(ReceivePipeWithClosedPeer, |
MOJO_DEADLINE_INDEFINITE, nullptr)); |
} |
-#if defined(OS_ANDROID) |
-// Android multi-process tests are not executing the new process. This is flaky. |
-#define MAYBE_SendPipeThenClosePeer DISABLED_SendPipeThenClosePeer |
-#else |
-#define MAYBE_SendPipeThenClosePeer SendPipeThenClosePeer |
-#endif |
-TEST_F(MultiprocessMessagePipeTest, MAYBE_SendPipeThenClosePeer) { |
+TEST_F(MultiprocessMessagePipeTest, SendPipeThenClosePeer) { |
RUN_CHILD_ON_PIPE(ReceivePipeWithClosedPeer, h) |
MojoHandle a, b; |
CreateMessagePipe(&a, &b); |
@@ -1266,13 +1176,7 @@ TEST_F(MultiprocessMessagePipeTest, |
} |
-#if defined(OS_ANDROID) |
-// Android multi-process tests are not executing the new process. This is flaky. |
-#define MAYBE_SendClosePeerSend DISABLED_SendClosePeerSend |
-#else |
-#define MAYBE_SendClosePeerSend SendClosePeerSend |
-#endif |
-TEST_F(MultiprocessMessagePipeTest, MAYBE_SendClosePeerSend) { |
+TEST_F(MultiprocessMessagePipeTest, SendClosePeerSend) { |
MojoHandle a, b; |
CreateMessagePipe(&a, &b); |
@@ -1315,13 +1219,7 @@ DEFINE_TEST_CLIENT_TEST_WITH_PIPE(WriteCloseSendPeerClient, |
EXPECT_EQ("quit", ReadMessage(h)); |
} |
-#if defined(OS_ANDROID) |
-// Android multi-process tests are not executing the new process. This is flaky. |
-#define MAYBE_WriteCloseSendPeer DISABLED_WriteCloseSendPeer |
-#else |
-#define MAYBE_WriteCloseSendPeer WriteCloseSendPeer |
-#endif |
-TEST_F(MultiprocessMessagePipeTest, MAYBE_WriteCloseSendPeer) { |
+TEST_F(MultiprocessMessagePipeTest, WriteCloseSendPeer) { |
MojoHandle pipe[2]; |
CreateMessagePipe(&pipe[0], &pipe[1]); |
@@ -1361,13 +1259,7 @@ DEFINE_TEST_CLIENT_TEST_WITH_PIPE(BootstrapMessagePipeAsyncClient, |
VerifyEcho(pipe.get().value(), "goodbye"); |
} |
-#if defined(OS_ANDROID) |
-// Android multi-process tests are not executing the new process. This is flaky. |
-#define MAYBE_BootstrapMessagePipeAsync DISABLED_BootstrapMessagePipeAsync |
-#else |
-#define MAYBE_BootstrapMessagePipeAsync BootstrapMessagePipeAsync |
-#endif |
-TEST_F(MultiprocessMessagePipeTest, MAYBE_BootstrapMessagePipeAsync) { |
+TEST_F(MultiprocessMessagePipeTest, BootstrapMessagePipeAsync) { |
// Tests that new cross-process message pipes can be created synchronously |
// using asynchronous negotiation over an arbitrary platform channel. |
RUN_CHILD_ON_PIPE(BootstrapMessagePipeAsyncClient, child) |