From 40be0663dd6eb549e829aedf1b7dff102ef9fff3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Fri, 11 Jul 2014 00:02:45 +0200 Subject: [PATCH] Fix local hosts for correct certificate tests. --- config/test.properties.template | 2 +- tests/org/cacert/gigi/testUtils/ManagedTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/test.properties.template b/config/test.properties.template index 703bda10..a94f0b53 100644 --- a/config/test.properties.template +++ b/config/test.properties.template @@ -1,5 +1,5 @@ type=local -server=localhost:443 +serverPort=443 mail=localhost:8474 # ==== OR === diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index 2f685dbf..880f6006 100644 --- a/tests/org/cacert/gigi/testUtils/ManagedTest.java +++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java @@ -62,7 +62,7 @@ public class ManagedTest { String type = testProps.getProperty("type"); if (type.equals("local")) { - url = testProps.getProperty("server"); + url = testProps.getProperty("name.www") + ":" + testProps.getProperty("serverPort"); String[] parts = testProps.getProperty("mail").split(":", 2); ter = new TestEmailReciever(new InetSocketAddress(parts[0], Integer.parseInt(parts[1]))); return; @@ -73,9 +73,9 @@ public class ManagedTest { System.out.println("... starting server"); Properties mainProps = new Properties(); mainProps.setProperty("host", "127.0.0.1"); - mainProps.setProperty("name.secure", "sec"); + mainProps.setProperty("name.secure", testProps.getProperty("name.secure")); mainProps.setProperty("name.www", testProps.getProperty("name.www")); - mainProps.setProperty("name.static", "stat"); + mainProps.setProperty("name.static", testProps.getProperty("name.static")); mainProps.setProperty("port", testProps.getProperty("serverPort")); mainProps.setProperty("emailProvider", "org.cacert.gigi.email.TestEmailProvider"); -- 2.39.2