summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrockot <rockot@chromium.org>2016-02-11 02:25:38 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-11 10:27:55 +0000
commit3fab8264f80086a7f37e9b526c5157b2bbae9256 (patch)
tree02a1b6da8ed619b772b2a0d9640cf9ba91c5c5aa
parent9ca3021996e87ad03adf4451fd7fc7f8097c8f46 (diff)
downloadchromium_src-3fab8264f80086a7f37e9b526c5157b2bbae9256.zip
chromium_src-3fab8264f80086a7f37e9b526c5157b2bbae9256.tar.gz
chromium_src-3fab8264f80086a7f37e9b526c5157b2bbae9256.tar.bz2
Mojo EDK: Disable flaking data pipe ping-pong tests
Though less frequent, they're still flaking: https://build.chromium.org/p/chromium.linux/buildstatus?builder=Linux%20Tests%20%28dbg%29%281%29&number=52104 BUG=585784 TBR=sammc@chromium.org Review URL: https://codereview.chromium.org/1686403002 Cr-Commit-Position: refs/heads/master@{#374879}
-rw-r--r--mojo/edk/system/message_pipe_unittest.cc20
1 files changed, 4 insertions, 16 deletions
diff --git a/mojo/edk/system/message_pipe_unittest.cc b/mojo/edk/system/message_pipe_unittest.cc
index 0589880..4b3a868 100644
--- a/mojo/edk/system/message_pipe_unittest.cc
+++ b/mojo/edk/system/message_pipe_unittest.cc
@@ -427,14 +427,8 @@ DEFINE_TEST_CLIENT_TEST_WITH_PIPE(HandlePingPong, MessagePipeTest, h) {
EXPECT_EQ(MOJO_RESULT_OK, ReadMessage(h, msg, &num_bytes));
}
-#if defined(OS_ANDROID)
-// Android multi-process tests are not executing the new process. This is flaky.
-#define MAYBE_DataPipeConsumerHandlePingPong \
- DISABLED_DataPipeConsumerHandlePingPong
-#else
-#define MAYBE_DataPipeConsumerHandlePingPong DataPipeConsumerHandlePingPong
-#endif
-TEST_F(MessagePipeTest, MAYBE_DataPipeConsumerHandlePingPong) {
+// This test is flaky: http://crbug.com/585784
+TEST_F(MessagePipeTest, DISABLED_DataPipeConsumerHandlePingPong) {
MojoHandle p, c[kPingPongHandlesPerIteration];
for (size_t i = 0; i < kPingPongHandlesPerIteration; ++i) {
EXPECT_EQ(MOJO_RESULT_OK, MojoCreateDataPipe(nullptr, &p, &c[i]));
@@ -452,14 +446,8 @@ TEST_F(MessagePipeTest, MAYBE_DataPipeConsumerHandlePingPong) {
MojoClose(c[i]);
}
-#if defined(OS_ANDROID)
-// Android multi-process tests are not executing the new process. This is flaky.
-#define MAYBE_DataPipeProducerHandlePingPong \
- DISABLED_DataPipeProducerHandlePingPong
-#else
-#define MAYBE_DataPipeProducerHandlePingPong DataPipeProducerHandlePingPong
-#endif
-TEST_F(MessagePipeTest, MAYBE_DataPipeProducerHandlePingPong) {
+// This test is flaky: http://crbug.com/585784
+TEST_F(MessagePipeTest, DISABLED_DataPipeProducerHandlePingPong) {
MojoHandle p[kPingPongHandlesPerIteration], c;
for (size_t i = 0; i < kPingPongHandlesPerIteration; ++i) {
EXPECT_EQ(MOJO_RESULT_OK, MojoCreateDataPipe(nullptr, &p[i], &c));