summaryrefslogtreecommitdiffstats
path: root/net/udp
diff options
context:
space:
mode:
authorlpromero <lpromero@chromium.org>2015-08-26 06:48:21 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-26 13:49:02 +0000
commitb5ff686e960825c7107aa08d641d944909a8042c (patch)
tree23962cf6d39ae1e32532ffa38c173e0d9ed35493 /net/udp
parent7873013e69f6204f016606b07cb33042403e759d (diff)
downloadchromium_src-b5ff686e960825c7107aa08d641d944909a8042c.zip
chromium_src-b5ff686e960825c7107aa08d641d944909a8042c.tar.gz
chromium_src-b5ff686e960825c7107aa08d641d944909a8042c.tar.bz2
UDPSocketTest.ClientGetLocalPeerAddresses is flaky on iOS devices.
BUG=523225 R=droger@chromium.org Review URL: https://codereview.chromium.org/1309683002 Cr-Commit-Position: refs/heads/master@{#345598}
Diffstat (limited to 'net/udp')
-rw-r--r--net/udp/udp_socket_unittest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/net/udp/udp_socket_unittest.cc b/net/udp/udp_socket_unittest.cc
index e4ad8dc..10ff90d 100644
--- a/net/udp/udp_socket_unittest.cc
+++ b/net/udp/udp_socket_unittest.cc
@@ -480,7 +480,14 @@ TEST_F(UDPSocketTest, VerifyConnectBindsAddr) {
DCHECK(simple_message == str);
}
-TEST_F(UDPSocketTest, ClientGetLocalPeerAddresses) {
+// TODO(ellyjones): This test is flaky on iOS devices bots.
+// http://crbug.com/523225
+#if defined(OS_IOS) && !TARGET_IPHONE_SIMULATOR
+#define MAYBE_ClientGetLocalPeerAddresses FLAKY_ClientGetLocalPeerAddresses
+#else
+#define MAYBE_ClientGetLocalPeerAddresses ClientGetLocalPeerAddresses
+#endif
+TEST_F(UDPSocketTest, MAYBE_ClientGetLocalPeerAddresses) {
struct TestData {
std::string remote_address;
std::string local_address;