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

Unified Diff: mojo/edk/system/data_pipe_unittest.cc

Issue 1676913002: [mojo] Delete third_party/mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: let's try that again Created 4 years, 10 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 | « mojo/edk/system/core_test_base.cc ('k') | mojo/edk/system/dispatcher_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/data_pipe_unittest.cc
diff --git a/mojo/edk/system/data_pipe_unittest.cc b/mojo/edk/system/data_pipe_unittest.cc
index 06c35a346373a02460c25d2e8f57b944c52dee3e..8ee52994b5c1be0a632bd400208f347c2fb0fc79 100644
--- a/mojo/edk/system/data_pipe_unittest.cc
+++ b/mojo/edk/system/data_pipe_unittest.cc
@@ -1656,6 +1656,8 @@ bool ReadAllData(MojoHandle consumer,
return num_bytes == 0;
}
+#if !defined(OS_IOS)
+
#if defined(OS_ANDROID)
// Android multi-process tests are not executing the new process. This is flaky.
#define MAYBE_Multiprocess DISABLED_Multiprocess
@@ -1835,7 +1837,13 @@ DEFINE_TEST_CLIENT_TEST_WITH_PIPE(ReadAndCloseConsumer, DataPipeTest, h) {
EXPECT_EQ("quit", ReadMessage(h));
}
-TEST_F(DataPipeTest, SendConsumerAndCloseProducer) {
+#if defined(OS_ANDROID)
+// Android multi-process tests are not executing the new process. This is flaky.
+#define MAYBE_SendConsumerAndCloseProducer DISABLED_SendConsumerAndCloseProducer
+#else
+#define MAYBE_SendConsumerAndCloseProducer SendConsumerAndCloseProducer
+#endif // defined(OS_ANDROID)
+TEST_F(DataPipeTest, MAYBE_SendConsumerAndCloseProducer) {
// Create a new data pipe.
MojoHandle p, c;
EXPECT_EQ(MOJO_RESULT_OK, MojoCreateDataPipe(nullptr, &p ,&c));
@@ -1878,7 +1886,13 @@ DEFINE_TEST_CLIENT_TEST_WITH_PIPE(CreateAndWrite, DataPipeTest, h) {
EXPECT_EQ("quit", ReadMessage(h));
}
-TEST_F(DataPipeTest, CreateInChild) {
+#if defined(OS_ANDROID)
+// Android multi-process tests are not executing the new process. This is flaky.
+#define MAYBE_CreateInChild DISABLED_CreateInChild
+#else
+#define MAYBE_CreateInChild CreateInChild
+#endif // defined(OS_ANDROID)
+TEST_F(DataPipeTest, MAYBE_CreateInChild) {
RUN_CHILD_ON_PIPE(CreateAndWrite, child)
MojoHandle c;
std::string expected_message = ReadMessageWithHandles(child, &c, 1);
@@ -1902,6 +1916,8 @@ TEST_F(DataPipeTest, CreateInChild) {
END_CHILD()
}
+#endif // !defined(OS_IOS)
+
} // namespace
} // namespace edk
} // namespace mojo
« no previous file with comments | « mojo/edk/system/core_test_base.cc ('k') | mojo/edk/system/dispatcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698