Skip to content

Commit 6daaf01

Browse files
Fixed temp folder for prefs.
1 parent 7b6be6e commit 6daaf01

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import datadog.trace.api.config.CiVisibilityConfig
66
import datadog.trace.api.config.GeneralConfig
77
import datadog.trace.api.config.TraceInstrumentationConfig
88
import datadog.trace.api.config.TracerConfig
9+
import spock.lang.Shared
910
import spock.lang.Specification
1011
import spock.lang.TempDir
1112
import spock.util.environment.Jvm
@@ -27,6 +28,10 @@ abstract class CiVisibilitySmokeTest extends Specification {
2728
@TempDir
2829
protected Path prefsDir
2930

31+
@Shared
32+
@TempDir
33+
protected Path prefsDirShared
34+
3035
protected static String buildJavaHome() {
3136
if (Jvm.current.isJava8()) {
3237
return System.getenv("JAVA_8_HOME")
@@ -77,7 +82,9 @@ abstract class CiVisibilitySmokeTest extends Specification {
7782
List<String> arguments = []
7883

7984
// Trick to avoid on CI: "Couldn't flush user prefs: java.util.prefs.BackingStoreException: Couldn't get file lock."
80-
arguments += "-Djava.util.prefs.userRoot=${prefsDir.toAbsolutePath()}"
85+
// Some tests can setup arguments on spec level, so `prefsDir` will be `null` during `setupSpec()`.
86+
String prefsPath = (prefsDir ?: prefsDirShared).toAbsolutePath()
87+
arguments += "-Djava.util.prefs.userRoot=$prefsPath".toString()
8188

8289
Map<String, String> argMap = buildJvmArgMap(mockBackendIntakeUrl, serviceName, additionalArgs)
8390

0 commit comments

Comments
 (0)