From 3fe883ddebca5de19caf5ef68c492db7eb6dc342 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Sat, 1 Nov 2014 21:29:34 +0100 Subject: [PATCH] Enable cache-clearance for autonomous test-launches --- src/org/cacert/gigi/DevelLauncher.java | 2 +- src/org/cacert/gigi/Launcher.java | 3 +++ src/org/cacert/gigi/dbObjects/CertificateOwner.java | 2 +- tests/org/cacert/gigi/testUtils/ManagedTest.java | 7 +++---- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/org/cacert/gigi/DevelLauncher.java b/src/org/cacert/gigi/DevelLauncher.java index f7bd763c..6a462f21 100644 --- a/src/org/cacert/gigi/DevelLauncher.java +++ b/src/org/cacert/gigi/DevelLauncher.java @@ -66,7 +66,7 @@ public class DevelLauncher { System.exit(0); } - private static void addDevelPage() { + public static void addDevelPage() { try { Field instF = Gigi.class.getDeclaredField("instance"); Field pageF = Gigi.class.getDeclaredField("pages"); diff --git a/src/org/cacert/gigi/Launcher.java b/src/org/cacert/gigi/Launcher.java index a47c9bfd..177d63ee 100644 --- a/src/org/cacert/gigi/Launcher.java +++ b/src/org/cacert/gigi/Launcher.java @@ -84,6 +84,9 @@ public class Launcher { Log.getLogger(Launcher.class).warn("Couldn't set uid!"); } } + if (conf.getMainProps().containsKey("testrunner")) { + DevelLauncher.addDevelPage(); + } } private static ServerConnector createConnector(GigiConfig conf, Server s, HttpConfiguration httpConfig, boolean doHttps) throws GeneralSecurityException, IOException { diff --git a/src/org/cacert/gigi/dbObjects/CertificateOwner.java b/src/org/cacert/gigi/dbObjects/CertificateOwner.java index 7c111bee..b41a404a 100644 --- a/src/org/cacert/gigi/dbObjects/CertificateOwner.java +++ b/src/org/cacert/gigi/dbObjects/CertificateOwner.java @@ -130,7 +130,7 @@ public abstract class CertificateOwner implements IdCachable { } public void delete() { - GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE certowners set deleted=NOW() WHERE id=?"); + GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE certOwners set deleted=NOW() WHERE id=?"); ps.setInt(1, getId()); ps.execute(); myCache.remove(this); diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index 2303ef70..6f6dfcf4 100644 --- a/tests/org/cacert/gigi/testUtils/ManagedTest.java +++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java @@ -161,14 +161,13 @@ public class ManagedTest extends ConfiguredTest { public static void clearCaches() throws IOException { ObjectCache.clearAllCaches(); String type = testProps.getProperty("type"); - if (type.equals("local")) { - URL u = new URL("https://" + getServerName() + "/manage"); - u.openConnection().getHeaderField("Location"); - } + URL u = new URL("https://" + getServerName() + "/manage"); + u.openConnection().getHeaderField("Location"); } private static Properties generateMainProps() { Properties mainProps = new Properties(); + mainProps.setProperty("testrunner", "true"); mainProps.setProperty("host", "127.0.0.1"); mainProps.setProperty("name.secure", testProps.getProperty("name.secure")); mainProps.setProperty("name.www", testProps.getProperty("name.www")); -- 2.39.2