diff --git a/kubernetes/istio/istio/src/main/java/org/arquillian/cube/istio/impl/IstioAssistant.java b/kubernetes/istio/istio/src/main/java/org/arquillian/cube/istio/impl/IstioAssistant.java index e8e5ac6bc..2ae01af78 100644 --- a/kubernetes/istio/istio/src/main/java/org/arquillian/cube/istio/impl/IstioAssistant.java +++ b/kubernetes/istio/istio/src/main/java/org/arquillian/cube/istio/impl/IstioAssistant.java @@ -124,7 +124,6 @@ public void await(final URL url, Function checker) { } public void await(final Request request, Function checker) { - /** rls TODO https://github.com/arquillian/arquillian-cube/issues/1282 Awaitility.await() .atMost(30, TimeUnit.SECONDS) .ignoreExceptions() @@ -133,6 +132,5 @@ public void await(final Request request, Function checker) { return checker.apply(response); } }); - **/ } } diff --git a/kubernetes/kubernetes/pom.xml b/kubernetes/kubernetes/pom.xml index 02e49cdf7..9e2391d31 100644 --- a/kubernetes/kubernetes/pom.xml +++ b/kubernetes/kubernetes/pom.xml @@ -123,6 +123,10 @@ org.jboss.arquillian.config arquillian-config-impl-base + + org.hamcrest + hamcrest + diff --git a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/KubernetesAssistant.java b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/KubernetesAssistant.java index 3e558d978..fda47c979 100644 --- a/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/KubernetesAssistant.java +++ b/kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/KubernetesAssistant.java @@ -409,7 +409,6 @@ public void awaitApplicationReadinessOrFail() { * @param applicationName name of the application to wait for pods readiness */ public void awaitApplicationReadinessOrFail(final String applicationName) { - /** rls TODO uncomment code and resolve compile issue. https://github.com/arquillian/arquillian-cube/issues/1282 await().atMost(5, TimeUnit.MINUTES).until(() -> { return client .replicationControllers() @@ -417,7 +416,6 @@ public void awaitApplicationReadinessOrFail(final String applicationName) { .withName(applicationName).isReady(); } ); - **/ } public String project() { @@ -430,7 +428,6 @@ public String project() { * @param filter used to wait to detect that a pod is up and running. */ public void awaitPodReadinessOrFail(Predicate filter) { - /** rls TODO uncomment code and resolve compile issue. https://github.com/arquillian/arquillian-cube/issues/1282 await().atMost(5, TimeUnit.MINUTES).until(() -> { List list = client.pods().inNamespace(namespace).list().getItems(); return list.stream() @@ -439,7 +436,6 @@ public void awaitPodReadinessOrFail(Predicate filter) { .collect(Collectors.toList()).size() >= 1; } ); - **/ } /** diff --git a/openshift/openshift/pom.xml b/openshift/openshift/pom.xml index 3757414bf..4c6fcf8c1 100644 --- a/openshift/openshift/pom.xml +++ b/openshift/openshift/pom.xml @@ -216,6 +216,10 @@ arquillian-junit-container test + + org.hamcrest + hamcrest + diff --git a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/ResourceUtil.java b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/ResourceUtil.java index 44e92d654..35cb873d4 100644 --- a/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/ResourceUtil.java +++ b/openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/ResourceUtil.java @@ -190,7 +190,6 @@ public static Binding toBinding(Service pod) { */ public static void awaitRoute(URL routeUrl, int timeout, TimeUnit timeoutUnit, int repetitions, int... statusCodes) { AtomicInteger successfulAwaitsInARow = new AtomicInteger(0); - /** rls TODO https://github.com/arquillian/arquillian-cube/issues/1282 await().atMost(timeout, timeoutUnit).until(() -> { if (tryConnect(routeUrl, statusCodes)) { successfulAwaitsInARow.incrementAndGet(); @@ -199,7 +198,6 @@ public static void awaitRoute(URL routeUrl, int timeout, TimeUnit timeoutUnit, i } return successfulAwaitsInARow.get() >= repetitions; }); - **/ } public static void awaitRoute(URL routeUrl, int timeout, TimeUnit timeoutUnit, int... statusCodes) { diff --git a/pom.xml b/pom.xml index 6f51f7d48..0cb32283f 100644 --- a/pom.xml +++ b/pom.xml @@ -436,6 +436,11 @@ ${version.hamcrest} test + + org.hamcrest + hamcrest + ${version.hamcrest} + io.fabric8 kubernetes-client