diff options
| author | digit@chromium.org <digit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 20:34:43 +0000 |
|---|---|---|
| committer | digit@chromium.org <digit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 20:34:43 +0000 |
| commit | 86c8e51230e2978697a9ad2174c31277ad8e5a65 (patch) | |
| tree | 96a02958059ac5cc643187fe141bd09bb061c3af /net/udp | |
| parent | 8f773620cac4539d56c1dc4f0c09076ffefb5bc9 (diff) | |
| download | chromium_src-86c8e51230e2978697a9ad2174c31277ad8e5a65.zip chromium_src-86c8e51230e2978697a9ad2174c31277ad8e5a65.tar.gz chromium_src-86c8e51230e2978697a9ad2174c31277ad8e5a65.tar.bz2 | |
net: Disable/fix three UDPSocketTest unit tests for Android.
BUG=139144,161245,161248
Review URL: https://chromiumcodereview.appspot.com/11420003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168010 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/udp')
| -rw-r--r-- | net/udp/udp_socket_unittest.cc | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/net/udp/udp_socket_unittest.cc b/net/udp/udp_socket_unittest.cc index 1be416a..a80da28 100644 --- a/net/udp/udp_socket_unittest.cc +++ b/net/udp/udp_socket_unittest.cc @@ -202,9 +202,14 @@ TEST_F(UDPSocketTest, Connect) { client_entries, 5, NetLog::TYPE_SOCKET_ALIVE)); } +#if defined(OS_MACOSX) // UDPSocketPrivate_Broadcast is disabled for OSX because it requires // root permissions on OSX 10.7+. -#if defined(OS_MACOSX) +TEST_F(UDPSocketTest, DISABLED_Broadcast) { +#elif defined(OS_ANDROID) +// It is also disabled for Android because it is extremely flaky. +// The first call to SendToSocket returns -109 (Address not reachable) +// in some unpredictable cases. crbug.com/139144. TEST_F(UDPSocketTest, DISABLED_Broadcast) { #else TEST_F(UDPSocketTest, Broadcast) { @@ -233,14 +238,14 @@ TEST_F(UDPSocketTest, Broadcast) { EXPECT_EQ(OK, rv); rv = SendToSocket(server1.get(), first_message, broadcast_address); - EXPECT_EQ(static_cast<int>(first_message.size()), rv); + ASSERT_EQ(static_cast<int>(first_message.size()), rv); std::string str = RecvFromSocket(server1.get()); ASSERT_EQ(first_message, str); str = RecvFromSocket(server2.get()); ASSERT_EQ(first_message, str); rv = SendToSocket(server2.get(), second_message, broadcast_address); - EXPECT_EQ(static_cast<int>(second_message.size()), rv); + ASSERT_EQ(static_cast<int>(second_message.size()), rv); str = RecvFromSocket(server1.get()); ASSERT_EQ(second_message, str); str = RecvFromSocket(server2.get()); @@ -281,7 +286,12 @@ class TestPrng { DISALLOW_COPY_AND_ASSIGN(TestPrng); }; +#if defined(OS_ANDROID) +// Disabled on Android for lack of 192.168.1.13. crbug.com/161245 +TEST_F(UDPSocketTest, DISABLED_ConnectRandomBind) { +#else TEST_F(UDPSocketTest, ConnectRandomBind) { +#endif std::vector<UDPClientSocket*> sockets; IPEndPoint peer_address; CreateUDPAddress("192.168.1.13", 53, &peer_address); @@ -400,9 +410,12 @@ TEST_F(UDPSocketTest, ClientGetLocalPeerAddresses) { bool may_fail; } tests[] = { { "127.0.00.1", "127.0.0.1", false }, - { "192.168.1.1", "127.0.0.1", false }, { "::1", "::1", true }, +#if !defined(OS_ANDROID) + // Addresses below are disabled on Android. See crbug.com/161248 + { "192.168.1.1", "127.0.0.1", false }, { "2001:db8:0::42", "::1", true }, +#endif }; for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); i++) { SCOPED_TRACE(std::string("Connecting from ") + tests[i].local_address + |