Fix Travis + stabilize test more

Author: LEDfan

.travis.yml

@@ -21,7 +21,7 @@ services:
 
 before_install:
 - docker pull openanalytics/shinyproxy-demo
-- sudo apt-get -qq -y install conntrack
+- sudo apt-get -qq -y install conntrack socat
 
 before_script:
 # Download kubectl, which is a requirement for using minikube.
@@ -41,5 +41,5 @@ script:
 - kubectl cluster-info
 # Wait for kube-dns to be ready.
 - JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'; until kubectl -n kube-system get pods -lk8s-app=kube-dns -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; do sleep 1;echo "waiting for kube-dns to be available"; kubectl get pods --all-namespaces; done
-- nohup socat TCP-LISTEN:2375,reuseaddr,fork UNIX-CONNECT:/var/run/docker.sock
+- nohup socat TCP-LISTEN:2375,reuseaddr,fork UNIX-CONNECT:/var/run/docker.sock &
 - mvn test

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

@@ -397,14 +397,7 @@ 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)
-					.endMetadata()
-					.build());
+			createOverridenNamespace();
 
 			client.serviceAccounts().inNamespace(overridenNamespace).create(new ServiceAccountBuilder()
 					.withNewMetadata()
@@ -470,12 +463,7 @@ public void launchProxyWithPodPatches() throws Exception {
 			assertEquals(0, proxyService.getProxies(null, true).size());
 
 		} finally {
-			// just to be sure both the namespace and service account are cleaned up
-			try {
-				client.namespaces().withName(overridenNamespace).delete();
-			} catch(Exception e) {
-
-			}
+			deleteOverridenNamespace();
 			try {
 				client.serviceAccounts().withName(serviceAccountName).delete();
 			} catch(Exception e) {
@@ -542,14 +530,8 @@ public void launchProxyWithPatchesWithMerging() throws Exception {
 	 */
 	@Test
 	public void launchProxyWithAdditionalManifests() throws Exception {
-		final String overridenNamespace = "it-b9fa0a24-overriden";
 		try {
-			System.out.println(client);
-			client.namespaces().create(new NamespaceBuilder()
-					.withNewMetadata()
-						.withName(overridenNamespace)
-					.endMetadata()
-					.build());
+			createOverridenNamespace();
 
 			String specId = environment.getProperty("proxy.specs[8].id");
 
@@ -602,8 +584,7 @@ public void launchProxyWithAdditionalManifests() throws Exception {
 
 			assertEquals(0, proxyService.getProxies(null, true).size());
 		} finally {
-			// just to be sure both the namespace and service account are cleaned up
-			client.namespaces().withName(overridenNamespace).delete();
+			deleteOverridenNamespace();
 		}
 	}
 
@@ -616,14 +597,8 @@ public void launchProxyWithAdditionalManifests() throws Exception {
 	 */
 	@Test
 	public void launchProxyWithAdditionalManifestsOfWhichOneAlreadyExists() throws Exception {
-		final String overridenNamespace = "it-b9fa0a24-overriden";
 		try {
-			System.out.println(client);
-			client.namespaces().create(new NamespaceBuilder()
-					.withNewMetadata()
-						.withName(overridenNamespace)
-					.endMetadata()
-					.build());
+			createOverridenNamespace();
 
 			// create the PVC
 			String pvcSpec = 
@@ -693,8 +668,30 @@ public void launchProxyWithAdditionalManifestsOfWhichOneAlreadyExists() throws E
 
 			assertEquals(0, proxyService.getProxies(null, true).size());
 		} finally {
+			deleteOverridenNamespace();
+		}
+	}
+	
+	private final String overridenNamespace = "it-b9fa0a24-overriden";
+
+	private void createOverridenNamespace() throws InterruptedException {
+		deleteOverridenNamespace();
+		while (client.namespaces().withName(overridenNamespace).get() != null) {
+			Thread.sleep(1000);
+		}
+		client.namespaces().create(new NamespaceBuilder()
+				.withNewMetadata()
+					.withName(overridenNamespace)
+				.endMetadata()
+				.build());
+	}
+
+	private void deleteOverridenNamespace() throws InterruptedException {
+		try {
 			// just to be sure both the namespace and service account are cleaned up
 			client.namespaces().withName(overridenNamespace).delete();
+		} catch (Exception e) {
+			// ignore
 		}
 	}
 
@@ -748,4 +745,5 @@ public synchronized void removeMapping(String path) {
 			// No-ops
 		}
 	}
+
 }