Skip to content

fix: attempt to fix flaky tests #1602

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

Merged
triceo merged 2 commits into from
May 21, 2025
Merged

fix: attempt to fix flaky tests #1602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39e6a27
fix: fix flaky tests
zepfred May 21, 2025
a8fa138
chore: address comments
zepfred May 21, 2025
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
6 changes: 4 additions & 2 deletions core/src/test/java/ai/timefold/solver/core/testutil/AbstractMeterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,17 @@

import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.parallel.ResourceLock;
import org.junit.jupiter.api.parallel.Execution;
import org.junit.jupiter.api.parallel.ExecutionMode;

import io.micrometer.core.instrument.Metrics;
import io.micrometer.core.instrument.MockClock;
import io.micrometer.core.instrument.config.NamingConvention;
import io.micrometer.core.instrument.simple.SimpleConfig;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;

@ResourceLock(value = "metrics") // Mutual exclusion to prevent flaky tests.
// We also want to ensure that tests of the same suite do not update the registry concurrently
@Execution(ExecutionMode.SAME_THREAD)
public abstract class AbstractMeterTest {

@BeforeEach // To guard against nasty tests which do not do this.
Expand Down
9 changes: 7 additions & 2 deletions core/src/test/java/ai/timefold/solver/core/testutil/PlannerTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,16 @@ public static <Solution_> SolverConfig buildSolverConfig(Class<Solution_> soluti
new TerminationConfig().withStepCountLimit(TERMINATION_STEP_COUNT_LIMIT)));
}

public static <Solution_> Solution_ solve(SolverConfig solverConfig, Solution_ problem) {
public static synchronized <Solution_> Solution_ solve(SolverConfig solverConfig, Solution_ problem) {
return solve(solverConfig, problem, true);
}

public static <Solution_> Solution_ solve(SolverConfig solverConfig, Solution_ problem, boolean bestSolutionEventExists) {
/**
* We need to synchronize the solving process because there are some shared resources, such as the Meter registry,
* which could be updated concurrently.
*/
public static synchronized <Solution_> Solution_ solve(SolverConfig solverConfig, Solution_ problem,
Comment thread
zepfred marked this conversation as resolved.
boolean bestSolutionEventExists) {
SolverFactory<Solution_> solverFactory = SolverFactory.create(solverConfig);
var solver = solverFactory.buildSolver();
var eventBestSolutionRef = new AtomicReference<Solution_>();
Expand Down
Loading