modules/enterprise/gui/installer/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java | 13 ++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
New commits: commit 157aaa969ec1e463b1fbd07403eeb6010ff1c5c7 Author: Jay Shaughnessy jshaughn@jshaughn.csb Date: Mon Nov 26 15:46:32 2012 -0500
Add some logging to help figure out jenkins failure.
diff --git a/modules/enterprise/gui/installer/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java b/modules/enterprise/gui/installer/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java index 1832aec..d3a237e 100644 --- a/modules/enterprise/gui/installer/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java +++ b/modules/enterprise/gui/installer/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java @@ -115,7 +115,7 @@ public class DBInstallationTest { installSchemaAndData("rhq-4.3.0"); ServerInstallUtil.upgradeExistingDatabaseSchema(getInstallProperties(), serverDetails, PASSWORD, logDir); } - + @Test public void upgradeRHQ440Schema() throws Exception { installSchemaAndData("rhq-4.4.0"); @@ -133,6 +133,15 @@ public class DBInstallationTest {
private void recreateTestDatabase() throws Exception { DBReset dbReset = new DBReset(); + + System.out.println("DBInstallationTest.recreateTestDatabase asking for DBReset for [" // + + DB_TYPE_MAPPING + "," // + + DB_URL + "," // + + DB_NAME + "," // + + USERNAME + "," // + + ADMIN_USERNAME + "," // + + ADMIN_PASSWORD + "]"); + dbReset.performDBReset(DB_TYPE_MAPPING, DB_URL, DB_NAME, USERNAME, ADMIN_USERNAME, ADMIN_PASSWORD); }
@@ -178,7 +187,7 @@ public class DBInstallationTest { dbProperties.put(ServerProperties.PROP_EMAIL_FROM_ADDRESS, "rhqadmin@localhost.com"); return dbProperties; } - + private static File filterXmlFile(File xmlFile, HashMap<String, String> props) throws IOException { // first slurp the file contents in memory InputStream fileInStream = new FileInputStream(xmlFile);
rhq-commits@lists.fedorahosted.org