X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2FtestUtils%2FManagedTest.java;h=869d417a47b7b932795e3bb6d32e20f075345cb0;hp=ce60a295832584c5c6b282af91bee8ae1de52838;hb=d690eda36eba121aa79e4f456d5f0eb481be8b86;hpb=474942bce8bf8f8e4d777c93b332bc64fc724824

diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java
index ce60a295..869d417a 100644
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -67,13 +67,19 @@ public class ManagedTest {
 						Integer.parseInt(parts[1])));
 				return;
 			}
-			url = "localhost:" + testProps.getProperty("serverPort");
+			url = testProps.getProperty("name.www") + ":"
+					+ testProps.getProperty("serverPort");
 			gigi = Runtime.getRuntime().exec(testProps.getProperty("java"));
 			DataOutputStream toGigi = new DataOutputStream(
 					gigi.getOutputStream());
 			System.out.println("... starting server");
 			Properties mainProps = new Properties();
 			mainProps.setProperty("host", "127.0.0.1");
+			mainProps.setProperty("name.secure", "sec");
+			mainProps
+					.setProperty("name.www", testProps.getProperty("name.www"));
+			mainProps.setProperty("name.static", "stat");
+
 			mainProps.setProperty("port", testProps.getProperty("serverPort"));
 			mainProps.setProperty("emailProvider",
 					"org.cacert.gigi.email.TestEmailProvider");
@@ -91,15 +97,10 @@ public class ManagedTest {
 			byte[] keystore = Files.readAllBytes(Paths
 					.get("config/keystore.pkcs12"));
 
-			DevelLauncher.writeGigiConfig(toGigi, new byte[]{},
+			DevelLauncher.writeGigiConfig(toGigi, "changeit".getBytes(),
 					"changeit".getBytes(), mainProps, cacerts, keystore);
 			toGigi.flush();
-			// TODO wait for ready
-			try {
-				Thread.sleep(3000);
-			} catch (InterruptedException e) {
-				e.printStackTrace();
-			}
+
 			final BufferedReader br = new BufferedReader(new InputStreamReader(
 					gigi.getErrorStream()));
 			String line;