Skip to content

Commit 2cb7960

Browse files
committed
Skip security manager tests for JDK 24+
1 parent c8f16f8 commit 2cb7960

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

dd-java-agent/src/test/groovy/datadog/trace/agent/InitializationTelemetryTest.groovy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@ package datadog.trace.agent
22

33
import spock.lang.Specification
44
import spock.lang.Timeout
5+
import spock.lang.IgnoreIf
6+
import datadog.trace.api.Platform
57

68
import jvmbootstraptest.InitializationTelemetryCheck
79

810
@Timeout(30)
11+
@IgnoreIf(reason = "SecurityManager is permanently disabled as of JDK 24", value = {
12+
Platform.isJavaVersionAtLeast(24)
13+
})
914
class InitializationTelemetryTest extends Specification {
1015
def "block agent start-up"() {
1116
// In this case, the SecurityManager blocks loading of the Premain Class,

dd-java-agent/src/test/groovy/datadog/trace/agent/SecurityManagerTest.groovy

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@ package datadog.trace.agent
22

33
import spock.lang.Specification
44
import spock.lang.Timeout
5+
import spock.lang.IgnoreIf
6+
import datadog.trace.api.Platform
57

68
import jvmbootstraptest.SecurityManagerCheck
79
import jvmbootstraptest.TestSecurityManager
810

911
@Timeout(30)
12+
@IgnoreIf(reason = "SecurityManager is permanently disabled as of JDK 24", value = {
13+
Platform.isJavaVersionAtLeast(24)
14+
})
1015
class SecurityManagerTest extends Specification {
1116
def "no env access"() {
1217
expect:
@@ -27,4 +32,4 @@ class SecurityManagerTest extends Specification {
2732
expect:
2833
SecurityManagerCheck.runTestJvm(TestSecurityManager.NoNetworkAccess) == 0
2934
}
30-
}
35+
}

0 commit comments

Comments
 (0)