diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2009-10-01 13:47:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-01 13:47:10 -0700 |
| commit | 8ff62d7073115d53bf99f10365d6318c77f958c3 (patch) | |
| tree | 529917c2401a3022c0e55716284c2fa47c1a3eda /luni | |
| parent | 4d26d908fc812a30683ff5b831f6ae77a2bedd30 (diff) | |
| parent | 87483174d28c679fce946ec69bef62ed0c52882d (diff) | |
| download | libcore-8ff62d7073115d53bf99f10365d6318c77f958c3.zip libcore-8ff62d7073115d53bf99f10365d6318c77f958c3.tar.gz libcore-8ff62d7073115d53bf99f10365d6318c77f958c3.tar.bz2 | |
am ae8d0254: am 0c0cfd5c: Merge change I96cd6f5b into eclair
Merge commit 'ae8d0254dd69392dae9c922462ca2a01944b6eef'
* commit 'ae8d0254dd69392dae9c922462ca2a01944b6eef':
Make the socket test accept ::1 as a valid result for
Diffstat (limited to 'luni')
| -rw-r--r-- | luni/src/test/java/tests/api/java/net/SocketTest.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/luni/src/test/java/tests/api/java/net/SocketTest.java b/luni/src/test/java/tests/api/java/net/SocketTest.java index 3d6fbeb..7cc31a0 100644 --- a/luni/src/test/java/tests/api/java/net/SocketTest.java +++ b/luni/src/test/java/tests/api/java/net/SocketTest.java @@ -158,7 +158,14 @@ public class SocketTest extends SocketTestCase { Socket socket = null; try { socket = new Socket(InetAddress.getByName(null), sport); - assertEquals(InetAddress.getByName("127.0.0.1"), socket.getLocalAddress()); + InetAddress address = socket.getLocalAddress(); + if (Boolean.getBoolean("java.net.preferIPv6Addresses")) { + assertTrue( + address.equals(InetAddress.getByName("::1")) || + address.equals(InetAddress.getByName("0:0:0:0:0:0:0:1"))); + } else { + assertEquals(address, InetAddress.getByName("127.0.0.1")); + } } finally { try { socket.close(); |