Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Attempt to fix intermittent failure in SimpleContextPropagationTest caused by possible race condition #27284

Merged
merged 1 commit into from
Aug 15, 2022
Merged

Attempt to fix intermittent failure in SimpleContextPropagationTest caused by possible race condition #27284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ...tests/smallrye-context-propagation/src/test/java/io/quarkus/context/test/RequestBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
package io.quarkus.context.test;

import java.util.concurrent.CountDownLatch;

import javax.annotation.PreDestroy;
import javax.enterprise.context.RequestScoped;

@RequestScoped
public class RequestBean {

public static volatile int DESTROY_INVOKED = 0;
public static volatile CountDownLatch LATCH;

public String callMe() {
return "Hello " + System.identityHashCode(this);
Expand All @@ -15,5 +18,14 @@ public String callMe() {
@PreDestroy
public void destroy() {
DESTROY_INVOKED++;
// bean is also used in tests where there is no latch
if (LATCH != null) {
LATCH.countDown();
}
}

public static void initState() {
LATCH = new CountDownLatch(2);
DESTROY_INVOKED = 0;
}
}
10 changes: 6 additions & 4 deletions ...ntext-propagation/src/test/java/io/quarkus/context/test/SimpleContextPropagationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,20 +75,22 @@ public void testArcTCContextPropagation() {
}

@Test()
public void testArcMEContextPropagationDisabled() {
public void testArcMEContextPropagationDisabled() throws InterruptedException {
// reset state
RequestBean.DESTROY_INVOKED = 0;
RequestBean.initState();
RestAssured.when().get("/context/noarc").then()
.statusCode(Response.Status.OK.getStatusCode());
Assertions.assertTrue(RequestBean.LATCH.await(3, TimeUnit.SECONDS));
Assertions.assertEquals(2, RequestBean.DESTROY_INVOKED);
}

@Test()
public void testArcTCContextPropagationDisabled() {
public void testArcTCContextPropagationDisabled() throws InterruptedException {
// reset state
RequestBean.DESTROY_INVOKED = 0;
RequestBean.initState();
RestAssured.when().get("/context/noarc-tc").then()
.statusCode(Response.Status.OK.getStatusCode());
Assertions.assertTrue(RequestBean.LATCH.await(3, TimeUnit.SECONDS));
Assertions.assertEquals(2, RequestBean.DESTROY_INVOKED);
}

Expand Down