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 my...@apache.org on 2011/04/26 22:28:01 UTC
svn commit: r1096890 -
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java
Author: myrnavl
Date: Tue Apr 26 20:28:00 2011
New Revision: 1096890
URL: http://svn.apache.org/viewvc?rev=1096890&view=rev
Log:
DERBY-4319; hang in suties.all with ibm 1.5 on AIX after ttestDefaultProperties
removing the skipping; this appears to have been fixed with DERBY-5192.
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java?rev=1096890&r1=1096889&r2=1096890&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java Tue Apr 26 20:28:00 2011
@@ -82,12 +82,8 @@ public class ServerPropertiesTest exten
// this fixture doesn't use a client/server setup, instead does the
// relevant starting/stopping inside the test
// Add security manager policy that allows executing java commands
- // omit on AIX JDK 1.5 for now as it is causing a hang DERBY-4319
- // see also ttestDefaultProperties below
- if (! (isPlatform(OsName.AIX) && isJava5())) {
suite.addTest(decorateTest("ttestSetPortPriority",
new String[] {}, new String[] {}, false));
- }
// test unfinished properties settings.
// decorateTest adds policy file and sets up properties
@@ -107,9 +103,7 @@ public class ServerPropertiesTest exten
};
// fixture hits error DRDA_MissingNetworkJar (Cannot find derbynet.jar) so,
// only run with jars
- // DERBY-4319
- if (TestConfiguration.loadingFromJars() &&
- (! (isPlatform(OsName.AIX) && isJava5())))
+ if (TestConfiguration.loadingFromJars())
suite.addTest(decorateTest("ttestDefaultProperties",
badServerProperties, new String[] {}, true));