Skip to content

Commit b0ccf93

Browse files
authored
Try fixing the test flakiness by using definitely not a Java fake PID (#11280)
Try fixing the test flakiness by using definitely not a Java fake PID Merge branch 'master' into jb/temp_tests_2 Co-authored-by: jaroslav.bachorik <jaroslav.bachorik@datadoghq.com>
1 parent 5a1127a commit b0ccf93

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

internal-api/src/test/java/datadog/trace/util/TempLocationManagerTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ void testCleanup(String subPath) throws Exception {
103103
assertNotNull(tempDir);
104104

105105
// fake temp location
106-
Path fakeTempDir = myDir.resolve(TempLocationManager.getBaseTempDirName()).resolve("pid_0000");
106+
Path fakeTempDir = myDir.resolve(TempLocationManager.getBaseTempDirName()).resolve("pid_fake");
107107
Files.createDirectories(fakeTempDir);
108108
Path tmpFile = Files.createFile(fakeTempDir.resolve("test.txt"));
109109
tmpFile.toFile().deleteOnExit(); // make sure this is deleted at exit
@@ -138,7 +138,7 @@ void testConcurrentCleanup(String section) throws Exception {
138138
baseDir.toFile().deleteOnExit();
139139

140140
Path fakeTempDir =
141-
baseDir.resolve(TempLocationManager.getBaseTempDirName() + "/pid_1234/scratch");
141+
baseDir.resolve(TempLocationManager.getBaseTempDirName() + "/pid_fake/scratch");
142142
Files.createDirectories(fakeTempDir);
143143
Path fakeTempFile = fakeTempDir.resolve("libxxx.so");
144144
Files.createFile(fakeTempFile);
@@ -291,7 +291,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs, boolean t
291291
baseDir.toFile().deleteOnExit();
292292
TempLocationManager instance = instance(baseDir, false, delayer, timeSource);
293293
Path mytempdir = instance.getTempDir();
294-
Path otherTempdir = mytempdir.getParent().resolve("pid_0000");
294+
Path otherTempdir = mytempdir.getParent().resolve("pid_fake");
295295
Files.createDirectories(otherTempdir);
296296
Files.createFile(mytempdir.resolve("dummy"));
297297
Files.createFile(otherTempdir.resolve("dummy"));

0 commit comments

Comments
 (0)