From 4796cb93dc80f7921a1724e5da87a1bbb0fc3717 Mon Sep 17 00:00:00 2001
From: "andrew@webrtc.org" <andrew@webrtc.org>
Date: Mon, 5 Jan 2015 23:56:19 +0000
Subject: [PATCH] Disable flaky RelayServerTest.TestExpiration on all
 platforms.

BUG=4134
TBR=pthatcher

Review URL: https://webrtc-codereview.appspot.com/37529004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@8001 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 webrtc/p2p/base/relayserver_unittest.cc | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/webrtc/p2p/base/relayserver_unittest.cc b/webrtc/p2p/base/relayserver_unittest.cc
index 8c1c0aed9c..afc8a403b4 100644
--- a/webrtc/p2p/base/relayserver_unittest.cc
+++ b/webrtc/p2p/base/relayserver_unittest.cc
@@ -486,14 +486,9 @@ 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, MAYBE_TestExpiration) {
+// Flaky, see https://code.google.com/p/webrtc/issues/detail?id=4134
+TEST_F(RelayServerTest, DISABLED_TestExpiration) {
   Allocate();
   Bind();