Skip to content

Commit 97d9ca1

Browse files
move test management check to isQuarantined
1 parent e6028c5 commit 97d9ca1

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import datadog.trace.api.civisibility.telemetry.tag.SkipReason;
99
import datadog.trace.civisibility.config.EarlyFlakeDetectionSettings;
1010
import datadog.trace.civisibility.config.ExecutionSettings;
11+
import datadog.trace.civisibility.config.TestManagementSettings;
1112
import datadog.trace.civisibility.execution.Regular;
1213
import datadog.trace.civisibility.execution.RetryUntilSuccessful;
1314
import datadog.trace.civisibility.execution.RunNTimes;
@@ -62,6 +63,10 @@ public boolean isFlaky(TestIdentifier test) {
6263
}
6364

6465
public boolean isQuarantined(TestIdentifier test) {
66+
TestManagementSettings testManagementSettings = executionSettings.getTestManagementSettings();
67+
if (!testManagementSettings.isEnabled()) {
68+
return false;
69+
}
6570
Collection<TestIdentifier> quarantinedTests = executionSettings.getQuarantinedTests();
6671
return quarantinedTests.contains(test.withoutParameters());
6772
}
@@ -105,7 +110,7 @@ public TestExecutionPolicy executionPolicy(TestIdentifier test, TestSourceData t
105110
config.getCiVisibilityFlakyRetryCount(), isQuarantined(test), autoRetriesUsed);
106111
}
107112

108-
if (executionSettings.getTestManagementSettings().isEnabled() && isQuarantined(test)) {
113+
if (isQuarantined(test)) {
109114
return new RunOnceIgnoreOutcome();
110115
}
111116

0 commit comments

Comments
 (0)