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/08/23 00:24:15 UTC
svn commit: r1160474 - in /db/derby/code/branches/10.8: ./
java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.java
Author: myrnavl
Date: Mon Aug 22 22:24:15 2011
New Revision: 1160474
URL: http://svn.apache.org/viewvc?rev=1160474&view=rev
Log:
DERBY-5287; tasks for 10.8.2 release
backporting fix for DERBY-5014 (1132747) to 10.8
Modified:
db/derby/code/branches/10.8/ (props changed)
db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.java
Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 22 22:24:15 2011
@@ -1,2 +1,2 @@
/db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612
+/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612
Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.java?rev=1160474&r1=1160473&r2=1160474&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.java (original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.java Mon Aug 22 22:24:15 2011
@@ -38,6 +38,7 @@ import org.apache.derbyTesting.junit.Sec
import org.apache.derbyTesting.junit.SupportFilesSetup;
import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
+import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
/**
This tests the sysinfo command
@@ -125,15 +126,19 @@ public class SysinfoTest extends BaseJDB
suite.addTest(decorateTest());
useProperties = true;
- Properties props = new Properties();
+ Properties sysprops = new Properties();
if (!TestConfiguration.loadingFromJars())
- props.put("sysinfotest.classesdir", findClassDir());
- props.put("derby.infolog.append","true");
- props.put("derby.locks.waitTimeout","120");
- props.put("derby.language.logStatementText","true");
+ sysprops.put("sysinfotest.classesdir", findClassDir());
+ sysprops.put("derby.infolog.append","true");
+ sysprops.put("derby.language.logStatementText","true");
//#drda property ,test for it in sysinfo output
- props.put("derby.drda.securityMechanism","USER_ONLY_SECURITY");
- suite.addTest(new SystemPropertyTestSetup(decorateTest(), props));
+ sysprops.put("derby.drda.securityMechanism","USER_ONLY_SECURITY");
+ Test test = new SystemPropertyTestSetup(decorateTest(), sysprops);
+ Properties prop = new Properties();
+ prop.put("derby.locks.waitTimeout","120");
+ test = new DatabasePropertyTestSetup(test, prop);
+ //suite.addTest(new SystemPropertyTestSetup(decorateTest(), props));
+ suite.addTest(test);
return suite;
}