提交 5b2c05ff 编写于 作者: A alanb

7183800: TEST_BUG: Update tests to run on Ubuntu 12.04 (localhost is 127.0.1.1)

Reviewed-by: alanb, chegar
Contributed-by: yiming.wang@oracle.com
上级 0c5454bf
......@@ -22,6 +22,7 @@
*/
/* @test
* @bug 4313882 7183800
* @summary Test DatagramChannel's send and receive methods
* @author Mike McCloskey
*/
......@@ -88,6 +89,9 @@ public class Connect {
bb.put("hello".getBytes());
bb.flip();
InetAddress address = InetAddress.getLocalHost();
if (address.isLoopbackAddress()) {
address = InetAddress.getLoopbackAddress();
}
InetSocketAddress isa = new InetSocketAddress(address, port);
dc.connect(isa);
dc.write(bb);
......
......@@ -22,7 +22,7 @@
*/
/* @test
* @bug 4849277
* @bug 4849277 7183800
* @summary Test DatagramChannel send while connected
* @author Mike McCloskey
*/
......@@ -46,14 +46,18 @@ public class ConnectedSend {
DatagramChannel sndChannel = DatagramChannel.open();
sndChannel.socket().bind(null);
InetAddress address = InetAddress.getLocalHost();
if (address.isLoopbackAddress()) {
address = InetAddress.getLoopbackAddress();
}
InetSocketAddress sender = new InetSocketAddress(
InetAddress.getLocalHost(),
address,
sndChannel.socket().getLocalPort());
DatagramChannel rcvChannel = DatagramChannel.open();
rcvChannel.socket().bind(null);
InetSocketAddress receiver = new InetSocketAddress(
InetAddress.getLocalHost(),
address,
rcvChannel.socket().getLocalPort());
rcvChannel.connect(sender);
......@@ -80,14 +84,18 @@ public class ConnectedSend {
private static void test2() throws Exception {
DatagramChannel sndChannel = DatagramChannel.open();
sndChannel.socket().bind(null);
InetAddress address = InetAddress.getLocalHost();
if (address.isLoopbackAddress()) {
address = InetAddress.getLoopbackAddress();
}
InetSocketAddress sender = new InetSocketAddress(
InetAddress.getLocalHost(),
address,
sndChannel.socket().getLocalPort());
DatagramChannel rcvChannel = DatagramChannel.open();
rcvChannel.socket().bind(null);
InetSocketAddress receiver = new InetSocketAddress(
InetAddress.getLocalHost(),
address,
rcvChannel.socket().getLocalPort());
rcvChannel.connect(sender);
......
......@@ -133,8 +133,11 @@ public class Launcher {
dc.close();
dc = DatagramChannel.open();
InetSocketAddress isa = new InetSocketAddress(InetAddress.getLocalHost(), port);
InetAddress address = InetAddress.getLocalHost();
if (address.isLoopbackAddress()) {
address = InetAddress.getLoopbackAddress();
}
InetSocketAddress isa = new InetSocketAddress(address, port);
dc.connect(isa);
return dc;
......
......@@ -23,7 +23,7 @@
/*
* @test
* @bug 4901808
* @bug 4901808 7183800
* @summary Check that RMI connection ids include client host name
* @author Eamonn McManus
* @run clean RMIConnectionIdTest
......@@ -60,7 +60,7 @@ public class RMIConnectionIdTest {
}
String clientAddr = rest.substring(0, spaceIndex);
InetAddress clientInetAddr = InetAddress.getByName(clientAddr);
InetAddress localAddr = InetAddress.getLocalHost();
InetAddress localAddr = clientInetAddr.isLoopbackAddress() ? InetAddress.getLoopbackAddress() : InetAddress.getLocalHost();
System.out.println("InetAddresses: local=" + localAddr + "; " +
"connectionId=" + clientInetAddr);
if (!localAddr.equals(clientInetAddr)) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册