Update libjingle to 50654631.
R=mallinath@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2000006
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4519 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/base/socket_unittest.cc b/talk/base/socket_unittest.cc
index ad06c1e..eafab81 100644
--- a/talk/base/socket_unittest.cc
+++ b/talk/base/socket_unittest.cc
@@ -363,6 +363,15 @@
EXPECT_EQ(0, client->Connect(bogus_dns_addr));
// Wait for connection to fail (EHOSTNOTFOUND).
+ bool dns_lookup_finished = false;
+ WAIT_(client->GetState() == AsyncSocket::CS_CLOSED, kTimeout,
+ dns_lookup_finished);
+ if (!dns_lookup_finished) {
+ LOG(LS_WARNING) << "Skipping test; DNS resolution took longer than 5 "
+ << "seconds.";
+ return;
+ }
+
EXPECT_EQ_WAIT(AsyncSocket::CS_CLOSED, client->GetState(), kTimeout);
EXPECT_FALSE(sink.Check(client.get(), testing::SSE_OPEN));
EXPECT_TRUE(sink.Check(client.get(), testing::SSE_ERROR));