Skip to content

Commit cebf091

Browse files
committed
[issue-1282]add org.hamcrest archive to bld and re-enbabled commented code
1 parent a0f44f2 commit cebf091

File tree

6 files changed

+13
-8
lines changed

6 files changed

+13
-8
lines changed

kubernetes/istio/istio/src/main/java/org/arquillian/cube/istio/impl/IstioAssistant.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ public void await(final URL url, Function<Response, Boolean> checker) {
124124
}
125125

126126
public void await(final Request request, Function<Response, Boolean> checker) {
127-
/** rls TODO https://github.com/arquillian/arquillian-cube/issues/1282
128127
Awaitility.await()
129128
.atMost(30, TimeUnit.SECONDS)
130129
.ignoreExceptions()
@@ -133,6 +132,5 @@ public void await(final Request request, Function<Response, Boolean> checker) {
133132
return checker.apply(response);
134133
}
135134
});
136-
**/
137135
}
138136
}

kubernetes/kubernetes/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,10 @@
123123
<groupId>org.jboss.arquillian.config</groupId>
124124
<artifactId>arquillian-config-impl-base</artifactId>
125125
</dependency>
126+
<dependency>
127+
<groupId>org.hamcrest</groupId>
128+
<artifactId>hamcrest</artifactId>
129+
</dependency>
126130
</dependencies>
127131

128132
<build>

kubernetes/kubernetes/src/main/java/org/arquillian/cube/kubernetes/impl/KubernetesAssistant.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -409,15 +409,13 @@ public void awaitApplicationReadinessOrFail() {
409409
* @param applicationName name of the application to wait for pods readiness
410410
*/
411411
public void awaitApplicationReadinessOrFail(final String applicationName) {
412-
/** rls TODO uncomment code and resolve compile issue. https://github.com/arquillian/arquillian-cube/issues/1282
413412
await().atMost(5, TimeUnit.MINUTES).until(() -> {
414413
return client
415414
.replicationControllers()
416415
.inNamespace(this.namespace)
417416
.withName(applicationName).isReady();
418417
}
419418
);
420-
**/
421419
}
422420

423421
public String project() {
@@ -430,7 +428,6 @@ public String project() {
430428
* @param filter used to wait to detect that a pod is up and running.
431429
*/
432430
public void awaitPodReadinessOrFail(Predicate<Pod> filter) {
433-
/** rls TODO uncomment code and resolve compile issue. https://github.com/arquillian/arquillian-cube/issues/1282
434431
await().atMost(5, TimeUnit.MINUTES).until(() -> {
435432
List<Pod> list = client.pods().inNamespace(namespace).list().getItems();
436433
return list.stream()
@@ -439,7 +436,6 @@ public void awaitPodReadinessOrFail(Predicate<Pod> filter) {
439436
.collect(Collectors.toList()).size() >= 1;
440437
}
441438
);
442-
**/
443439
}
444440

445441
/**

openshift/openshift/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,10 @@
216216
<artifactId>arquillian-junit-container</artifactId>
217217
<scope>test</scope>
218218
</dependency>
219+
<dependency>
220+
<groupId>org.hamcrest</groupId>
221+
<artifactId>hamcrest</artifactId>
222+
</dependency>
219223
</dependencies>
220224

221225
</project>

openshift/openshift/src/main/java/org/arquillian/cube/openshift/impl/client/ResourceUtil.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ public static Binding toBinding(Service pod) {
190190
*/
191191
public static void awaitRoute(URL routeUrl, int timeout, TimeUnit timeoutUnit, int repetitions, int... statusCodes) {
192192
AtomicInteger successfulAwaitsInARow = new AtomicInteger(0);
193-
/** rls TODO https://github.com/arquillian/arquillian-cube/issues/1282
194193
await().atMost(timeout, timeoutUnit).until(() -> {
195194
if (tryConnect(routeUrl, statusCodes)) {
196195
successfulAwaitsInARow.incrementAndGet();
@@ -199,7 +198,6 @@ public static void awaitRoute(URL routeUrl, int timeout, TimeUnit timeoutUnit, i
199198
}
200199
return successfulAwaitsInARow.get() >= repetitions;
201200
});
202-
**/
203201
}
204202

205203
public static void awaitRoute(URL routeUrl, int timeout, TimeUnit timeoutUnit, int... statusCodes) {

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,11 @@
436436
<version>${version.hamcrest}</version>
437437
<scope>test</scope>
438438
</dependency>
439+
<dependency>
440+
<groupId>org.hamcrest</groupId>
441+
<artifactId>hamcrest</artifactId>
442+
<version>${version.hamcrest}</version>
443+
</dependency>
439444
<dependency>
440445
<groupId>io.fabric8</groupId>
441446
<artifactId>kubernetes-client</artifactId>

0 commit comments

Comments
 (0)