You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by km...@apache.org on 2013/07/31 17:23:33 UTC
svn commit: r1508917 - in /db/derby/code/branches/10.10: ./
java/testing/org/apache/derbyTesting/functionTests/tests/management/NetworkServerMBeanTest.java
Author: kmarsden
Date: Wed Jul 31 15:23:33 2013
New Revision: 1508917
URL: http://svn.apache.org/r1508917
Log:
DERBY-6294 On z/os on some machines:testAttributeDrdaHost(org.apache.derbyTesting.functionTests.tests.management.NetworkServerMBeanTest)junit.framework.AssertionFailedError
Add IPV6 loopback address (0:0:0:0:0:0:0:1) to test
Modified:
db/derby/code/branches/10.10/ (props changed)
db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/management/NetworkServerMBeanTest.java
Propchange: db/derby/code/branches/10.10/
------------------------------------------------------------------------------
Merged /db/derby/code/trunk:r1508853
Modified: db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/management/NetworkServerMBeanTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/management/NetworkServerMBeanTest.java?rev=1508917&r1=1508916&r2=1508917&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/management/NetworkServerMBeanTest.java (original)
+++ db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/management/NetworkServerMBeanTest.java Wed Jul 31 15:23:33 2013
@@ -173,14 +173,16 @@ public class NetworkServerMBeanTest exte
// localhost may also be 127.0.0.1
// serverHost = expected host
String serverHost = TestConfiguration.getCurrent().getHostName();
- if (serverHost.equals("localhost") || serverHost.equals("127.0.0.1")) {
+ if (serverHost.equals("localhost") || serverHost.equals("127.0.0.1") ||
+ serverHost.equals(" 0:0:0:0:0:0:0:1")) {
String mbeanHost = (String) getAttribute(
getNetworkServerMBeanObjectName(),
"DrdaHost");
assertNotNull(mbeanHost);
- assertTrue("mbeanHost = " + mbeanHost + " (not localhost or 127.0.0.1)",
+ assertTrue("mbeanHost = " + mbeanHost + " (not localhost, 127.0.0.1, or 0:0:0:0:0:0:0:1)",
mbeanHost.equals("localhost")
- || mbeanHost.equals("127.0.0.1"));
+ || mbeanHost.equals("127.0.0.1") ||
+ mbeanHost.equals("0:0:0:0:0:0:0:1"));
} else {
assertStringAttribute(serverHost,
getNetworkServerMBeanObjectName(),