Fix local hosts for correct certificate tests.

diff --git a/config/test.properties.template b/config/test.properties.template
index 703bda1066c2305435905a751a3619fb21904bb0..a94f0b53218ba99a95cd286c60fa77b6d8875bdc 100644 (file)
--- 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 2f685dbf9c1a4bb95c5a807db9f67d0de16be730..880f600631fa7a77c2b976d23bdfd5ae8039126f 100644 (file)
--- 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");