summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkchien <markchien@google.com>2019-05-08 01:59:24 -0700
committerMark Chien <markchien@google.com>2019-05-08 09:41:49 +0000
commit777b177c6ff6583cee0665682e1f95c99f38d9b6 (patch)
tree41d15fd7800a8bb5f9d961244d9e54cc9465ef10
parent13e7797f9aed26d0ef878dab2c6b6db267c1ebef (diff)
downloadtests-777b177c6ff6583cee0665682e1f95c99f38d9b6.tar.gz
Fix tcp_repair_test that use mapped addresses
There is different between bionic (on-device tests) and glibc (VM tests) around interpreting IPv4-mapped addresses. Bionic don't convert mapped addresses into IPv4 addresses. Bug: 130199266 Test: run_net_test.sh tcp_repair_test.py Test: m kernel_net_tests && adb push && adb shell /data/nativetest64/kernel_net_tests/kernel_net_tests Change-Id: I4705464a97c6daec36c69ce72cde58a8bc705929 Merged-In: I2b4c9f111f19dab4cfe29ce16ca130cdff2fba91 (cherry picked from commit f4599d1a1231dfaafe71ece2d7533fb8d8d5d21b)
-rwxr-xr-xnet/test/tcp_repair_test.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/test/tcp_repair_test.py b/net/test/tcp_repair_test.py
index af67def..ce54aba 100755
--- a/net/test/tcp_repair_test.py
+++ b/net/test/tcp_repair_test.py
@@ -73,8 +73,9 @@ class TcpRepairTest(multinetwork_base.MultiNetworkBaseTest):
net_test.DisableFinWait(s)
self.SelectInterface(s, netid, "mark")
- remoteaddr = self.GetRemoteSocketAddress(version)
- self.assertRaisesErrno(EINPROGRESS, s.connect, (remoteaddr, TEST_PORT))
+ remotesockaddr = self.GetRemoteSocketAddress(version)
+ remoteaddr = self.GetRemoteAddress(version)
+ self.assertRaisesErrno(EINPROGRESS, s.connect, (remotesockaddr, TEST_PORT))
self.assertSocketNotConnected(s)
myaddr = self.MyAddress(version, netid)