summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphoglund <phoglund@chromium.org>2016-03-21 03:02:03 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-21 10:03:52 +0000
commit2eb284ca133d3c1a4e96418e60eb9a3ad72f2aa9 (patch)
tree903d837a4db012bf640cdd6feec3ec2ff67e7b42
parentfe798ace4947a979b13dd4da463ece27ccfde840 (diff)
downloadchromium_src-2eb284ca133d3c1a4e96418e60eb9a3ad72f2aa9.zip
chromium_src-2eb284ca133d3c1a4e96418e60eb9a3ad72f2aa9.tar.gz
chromium_src-2eb284ca133d3c1a4e96418e60eb9a3ad72f2aa9.tar.bz2
Disabling flaky RecvMsgDescriptorLeak
TBR=mdempsky@chromium.org BUG=595199 Review URL: https://codereview.chromium.org/1824593002 Cr-Commit-Position: refs/heads/master@{#382261}
-rw-r--r--sandbox/linux/syscall_broker/broker_process_unittest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/sandbox/linux/syscall_broker/broker_process_unittest.cc b/sandbox/linux/syscall_broker/broker_process_unittest.cc
index 15e1ffb..c760084 100644
--- a/sandbox/linux/syscall_broker/broker_process_unittest.cc
+++ b/sandbox/linux/syscall_broker/broker_process_unittest.cc
@@ -489,9 +489,16 @@ TEST(BrokerProcess, OpenComplexFlagsNoClientCheck) {
// expected.
}
+#if defined(OS_LINUX)
+// Flaky on Linux NG bots: https://crbug.com/595199.
+#define MAYBE_RecvMsgDescriptorLeak DISABLED_RecvMsgDescriptorLeak
+#else
+#define MAYBE_RecvMsgDescriptorLeak RecvMsgDescriptorLeak
+#endif
+
// We need to allow noise because the broker will log when it receives our
// bogus IPCs.
-SANDBOX_TEST_ALLOW_NOISE(BrokerProcess, RecvMsgDescriptorLeak) {
+SANDBOX_TEST_ALLOW_NOISE(BrokerProcess, MAYBE_RecvMsgDescriptorLeak) {
// Android creates a socket on first use of the LOG call.
// We need to ensure this socket is open before we
// begin the test.