Skip to content

Commit

Permalink
[issue-1282]add org.hamcrest archive to bld and re-enbabled commented…
Browse files Browse the repository at this point in the history
… code
  • Loading branch information
rsearls committed Dec 4, 2023
1 parent a0f44f2 commit cebf091
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ public void await(final URL url, Function<Response, Boolean> checker) {
}

public void await(final Request request, Function<Response, Boolean> checker) {
/** rls TODO https://github.com/arquillian/arquillian-cube/issues/1282
Awaitility.await()
.atMost(30, TimeUnit.SECONDS)
.ignoreExceptions()
Expand All @@ -133,6 +132,5 @@ public void await(final Request request, Function<Response, Boolean> checker) {
return checker.apply(response);
}
});
**/
}
}
4 changes: 4 additions & 0 deletions kubernetes/kubernetes/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,10 @@
<groupId>org.jboss.arquillian.config</groupId>
<artifactId>arquillian-config-impl-base</artifactId>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
</dependency>
</dependencies>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -409,15 +409,13 @@ 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()
.inNamespace(this.namespace)
.withName(applicationName).isReady();
}
);
**/
}

public String project() {
Expand All @@ -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<Pod> filter) {
/** rls TODO uncomment code and resolve compile issue. https://github.com/arquillian/arquillian-cube/issues/1282
await().atMost(5, TimeUnit.MINUTES).until(() -> {
List<Pod> list = client.pods().inNamespace(namespace).list().getItems();
return list.stream()
Expand All @@ -439,7 +436,6 @@ public void awaitPodReadinessOrFail(Predicate<Pod> filter) {
.collect(Collectors.toList()).size() >= 1;
}
);
**/
}

/**
Expand Down
4 changes: 4 additions & 0 deletions openshift/openshift/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,10 @@
<artifactId>arquillian-junit-container</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
</dependency>
</dependencies>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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) {
Expand Down
5 changes: 5 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,11 @@
<version>${version.hamcrest}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>${version.hamcrest}</version>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
Expand Down

0 comments on commit cebf091

Please sign in to comment.