From aeb0dd30791c8d3f2954038d0a73c60c2e00565c Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Sat, 3 Jan 2015 17:47:05 +0000 Subject: [PATCH] Disable RelayServerTest.TestExpiration on Mac. The test is flaky on Mac. BUG=4134 TBR=pthatcher@webrtc.org Review URL: https://webrtc-codereview.appspot.com/33749004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7992 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/p2p/base/relayserver_unittest.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/webrtc/p2p/base/relayserver_unittest.cc b/webrtc/p2p/base/relayserver_unittest.cc index 0bff03999..8c1c0aed9 100644 --- a/webrtc/p2p/base/relayserver_unittest.cc +++ b/webrtc/p2p/base/relayserver_unittest.cc @@ -486,8 +486,14 @@ TEST_F(RelayServerTest, TestSendRaw) { } } +// Flaky on Mac, see https://code.google.com/p/webrtc/issues/detail?id=4134 +#if defined(WEBRTC_MAC) +#define MAYBE_TestExpiration DISABLED_TestExpiration +#else +#define MAYBE_TestExpiration TestExpiration +#endif // Verify that a binding expires properly, and rejects send requests. -TEST_F(RelayServerTest, TestExpiration) { +TEST_F(RelayServerTest, MAYBE_TestExpiration) { Allocate(); Bind();