Stabelize tests

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/backend/kubernetes/KubernetesBackend.java

@@ -457,6 +457,11 @@ private String getInstanceId() throws JsonParseException, JsonMappingException,
 		if (!file.exists()) {
 			file = Paths.get(ContainerProxyApplication.CONFIG_DEMO_PROFILE).toFile();
 		}
+		if (!file.exists()) {
+			// this should only happen in tests
+			instanceId = "unknown-instance-id";
+			return instanceId;
+		}
 
 		Object parsedConfig = objectMapper.readValue(file, Object.class);
 		String canonicalConfigFile =  objectMapper.writeValueAsString(parsedConfig);

src/test/java/eu/openanalytics/containerproxy/test/proxy/TestConcurrentUsers.java

@@ -81,6 +81,7 @@ public void test1User2Sessions1Spec() throws Exception {
 		String proxyId2 = loginAndLaunchProxy(user1[0], user1[1], specIds[0]);
 		doDeleteProxy(proxyId1, user1[0], user1[1]);
 		doDeleteProxy(proxyId2, user1[0], user1[1]);
+		Thread.sleep(2000); // delete is handled async -> give time to stop container
 	}
 
 	@Test
@@ -89,6 +90,7 @@ public void test1User2Sessions2Specs() throws Exception {
 		String proxyId2 = loginAndLaunchProxy(user1[0], user1[1], specIds[1]);
 		doDeleteProxy(proxyId1, user1[0], user1[1]);
 		doDeleteProxy(proxyId2, user1[0], user1[1]);
+		Thread.sleep(2000); // delete is handled async -> give time to stop container
 	}
 
 	@Test
@@ -97,6 +99,7 @@ public void test2Users2Sessions1Spec() throws Exception {
 		String proxyId2 = loginAndLaunchProxy(user2[0], user2[1], specIds[0]);
 		doDeleteProxy(proxyId1, user1[0], user1[1]);
 		doDeleteProxy(proxyId2, user2[0], user2[1]);
+		Thread.sleep(2000); // delete is handled async -> give time to stop container
 	}
 
 	@Test
@@ -105,6 +108,7 @@ public void test2Users2Sessions2Specs() throws Exception {
 		String proxyId2 = loginAndLaunchProxy(user2[0], user2[1], specIds[1]);
 		doDeleteProxy(proxyId1, user1[0], user1[1]);
 		doDeleteProxy(proxyId2, user2[0], user2[1]);
+		Thread.sleep(2000); // delete is handled async -> give time to stop container
 	}
 
 	private String loginAndLaunchProxy(String username, String password, String specId) throws Exception {

src/test/java/eu/openanalytics/containerproxy/test/proxy/TestIntegrationOnKube.java

@@ -397,6 +397,9 @@ public void launchProxyWithPodPatches() throws Exception {
 		final String overridenNamespace = "it-b9fa0a24-overriden";
 		final String serviceAccountName = "sp-ittest-b9fa0a24-account";
 		try {
+			while (client.namespaces().withName(overridenNamespace).get() != null) {
+				Thread.sleep(1000);
+			}
 			client.namespaces().create(new NamespaceBuilder()
 					.withNewMetadata()
 						.withName(overridenNamespace)

src/test/resources/application-test-ldap-auth.yml

@@ -1,3 +1,10 @@
+spring:
+  session:
+    store-type: none
+  data:
+     redis:
+        repositories:
+           enabled: false
 proxy:
   authentication: ldap
   ldap:

src/test/resources/application-test-no-auth.yml

@@ -1,3 +1,10 @@
+spring:
+  session:
+    store-type: none
+  data:
+     redis:
+        repositories:
+           enabled: false
 proxy:
   authentication: none
   specs:

src/test/resources/application-test-simple-auth.yml

@@ -1,3 +1,10 @@
+spring:
+  session:
+    store-type: none
+  data:
+     redis:
+        repositories:
+           enabled: false
 proxy:
   authentication: simple
   users:

src/test/resources/application-test.yml

@@ -1,7 +1,15 @@
+spring:
+  session:
+    store-type: none
+  data:
+     redis:
+        repositories:
+           enabled: false
 proxy:
   authentication: simple
   container-backend: docker
 
+
   users:
   - name: demo
     password: demo