Skip to content

Commit 5a1b2b7

Browse files
Merge pull request #4925 from sarveshkaushal/sarveshkaushal/shared-processor-test
fix: removing Thread.sleep() from SharedProcessorTest
2 parents bbf79a6 + 838d1b9 commit 5a1b2b7

1 file changed

Lines changed: 25 additions & 9 deletions

File tree

‎util/src/test/java/io/kubernetes/client/informer/cache/SharedProcessorTest.java‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,16 @@
2121
import java.time.Duration;
2222
import java.util.concurrent.CountDownLatch;
2323
import java.util.concurrent.Executors;
24+
import java.util.concurrent.Semaphore;
25+
import java.util.concurrent.TimeUnit;
26+
import java.util.concurrent.atomic.AtomicBoolean;
27+
2428
import org.junit.jupiter.api.Test;
2529

2630
class SharedProcessorTest {
2731

32+
private static final long TIMEOUT_SECONDS = 10;
33+
2834
@Test
2935
void listenerAddition() throws InterruptedException {
3036

@@ -67,23 +73,33 @@ void shutdownGracefully() throws InterruptedException {
6773
SharedProcessor<V1Pod> sharedProcessor =
6874
new SharedProcessor<>(Executors.newCachedThreadPool(), Duration.ofSeconds(5));
6975
TestWorker<V1Pod> slowWorker = new TestWorker<>(null, 0);
70-
final boolean[] interrupted = {false};
71-
CountDownLatch latch = new CountDownLatch(1);
76+
AtomicBoolean interrupted = new AtomicBoolean();
77+
Semaphore workerStarted = new Semaphore(0);
78+
Semaphore blockWorker = new Semaphore(0);
79+
Semaphore workerFinished = new Semaphore(0);
7280
slowWorker.setTask(
7381
() -> {
82+
workerStarted.release();
7483
try {
75-
// sleep 10s so that it could be interrupted by shutdownNow()
76-
Thread.sleep(10 * 1000);
84+
blockWorker.acquire();
7785
} catch (InterruptedException e) {
78-
interrupted[0] = true;
86+
interrupted.set(true);
87+
Thread.currentThread().interrupt();
7988
} finally {
80-
latch.countDown();
89+
workerFinished.release();
8190
}
8291
});
8392
sharedProcessor.addAndStartListener(slowWorker);
84-
sharedProcessor.stop();
85-
latch.await();
86-
assertThat(interrupted[0]).isTrue();
93+
boolean started = workerStarted.tryAcquire(TIMEOUT_SECONDS, TimeUnit.SECONDS);
94+
try {
95+
assertThat(started).as("worker started").isTrue();
96+
} finally {
97+
sharedProcessor.stop();
98+
}
99+
assertThat(workerFinished.tryAcquire(TIMEOUT_SECONDS, TimeUnit.SECONDS))
100+
.as("worker finished")
101+
.isTrue();
102+
assertThat(interrupted.get()).as("worker was interrupted").isTrue();
87103
}
88104

89105
private static class ExpectingNoticationHandler<ApiType extends KubernetesObject>

0 commit comments

Comments
 (0)