Skip to content

Commit d40af03

Browse files
committed
Fix test flakiness
1 parent 4e2e5cf commit d40af03

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

test-resources-extensions/test-resources-extensions-junit-platform/build.gradle

-4
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,3 @@ dependencies {
6161
testRuntimeOnly(mn.snakeyaml)
6262
kspKoTest(mn.micronaut.inject.kotlin)
6363
}
64-
65-
tasks.withType(Test).configureEach {
66-
enabled = false
67-
}

test-resources-extensions/test-resources-extensions-junit-platform/src/main/java/io/micronaut/test/extensions/junit5/TestResourcesScopeListener.java

+3
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,10 @@ private void visitRequiredScope(TestIdentifier id, EventKind kind, String scopeN
132132
case TEST_STARTED -> {
133133
ScopeHolder.get().ifPresent(nestedScopes::push);
134134
ScopeHolder.set(scopeName);
135+
System.out.println("testId = " + testId + " started with scope " + scopeName + " nested scopes = " + nestedScopes);
135136
}
136137
case TEST_FINISHED -> {
138+
System.out.println("testId = " + testId + " finished with scope " + scopeName + " nested scopes = " + nestedScopes);
137139
// We need to make sure the test id was known, because kotest
138140
// can issue new test ids which weren't known at registration
139141
if (testIdentifiers.remove(testId)) {
@@ -145,6 +147,7 @@ private void visitRequiredScope(TestIdentifier id, EventKind kind, String scopeN
145147
testResourcesClient.closeScope(scopeName);
146148
}
147149
}
150+
System.out.println("testId = " + testId + " finished and remaining nested scopes = " + nestedScopes);
148151
}
149152
}
150153
}

test-resources-extensions/test-resources-extensions-junit-platform/src/test/java/io/micronaut/test/extensions/junit5/AbstractScopedTest.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,15 @@
1717

1818
import io.micronaut.test.extensions.testresources.junit5.FakeTestResourcesClient;
1919
import org.junit.jupiter.api.AfterAll;
20+
import org.junit.jupiter.api.BeforeAll;
2021

2122
public abstract class AbstractScopedTest {
2223
@AfterAll
23-
static void reset() {
24+
static void resetAfter() {
25+
FakeTestResourcesClient.reset();
26+
}
27+
@BeforeAll
28+
static void resetBefore() {
2429
FakeTestResourcesClient.reset();
2530
}
2631
}

0 commit comments

Comments
 (0)