Skip to content

Commit 12284d6

Browse files
committed
test: use correct time unit for expectation timeout
Signed-off-by: David Sondermann <david.sondermann@hivemq.com>
1 parent 254063b commit 12284d6

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/ExpectationIT.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*/
1616
package io.javaoperatorsdk.operator.baseapi.expectation;
1717

18+
import java.time.Duration;
19+
1820
import org.junit.jupiter.api.Test;
1921
import org.junit.jupiter.api.extension.RegisterExtension;
2022

@@ -35,7 +37,7 @@ class ExpectationIT {
3537

3638
@Test
3739
void testExpectation() {
38-
extension.getReconcilerOfType(ExpectationReconciler.class).setTimeout(30000L);
40+
extension.getReconcilerOfType(ExpectationReconciler.class).setTimeout(Duration.ofSeconds(30));
3941
var res = testResource();
4042
extension.create(res);
4143

@@ -50,7 +52,7 @@ void testExpectation() {
5052

5153
@Test
5254
void expectationTimeouts() {
53-
extension.getReconcilerOfType(ExpectationReconciler.class).setTimeout(300L);
55+
extension.getReconcilerOfType(ExpectationReconciler.class).setTimeout(Duration.ofMillis(300));
5456
var res = testResource();
5557
extension.create(res);
5658

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/ExpectationReconciler.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import java.time.Duration;
1919
import java.util.List;
2020
import java.util.Map;
21+
import java.util.concurrent.atomic.AtomicReference;
2122

2223
import io.fabric8.kubernetes.api.model.ContainerBuilder;
2324
import io.fabric8.kubernetes.api.model.ContainerPortBuilder;
@@ -48,11 +49,11 @@ public class ExpectationReconciler implements Reconciler<ExpectationCustomResour
4849

4950
private final ExpectationManager<ExpectationCustomResource> expectationManager =
5051
new ExpectationManager<>();
52+
private final AtomicReference<Duration> timeoutRef =
53+
new AtomicReference<>(Duration.ofSeconds(30));
5154

52-
private volatile Long timeout = 30000L;
53-
54-
public void setTimeout(Long timeout) {
55-
this.timeout = timeout;
55+
public void setTimeout(Duration timeout) {
56+
timeoutRef.set(timeout);
5657
}
5758

5859
@Override
@@ -74,7 +75,7 @@ public UpdateControl<ExpectationCustomResource> reconcile(
7475
createDeployment(primary, context);
7576
var set =
7677
expectationManager.checkAndSetExpectation(
77-
primary, context, Duration.ofSeconds(timeout), deploymentReadyExpectation());
78+
primary, context, timeoutRef.get(), deploymentReadyExpectation());
7879
if (set) {
7980
return UpdateControl.noUpdate();
8081
}

0 commit comments

Comments
 (0)