infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-12 14:39:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

8172870: test/tools/jmod/JmodTest.java fails on windows with AccessDeniedException

Browse Source 
Reviewed-by: alanb, chegar
This commit is contained in:
Mandy Chung 2017-01-18 11:08:46 -08:00
parent 7f74bcf6bc
commit ded129adbf
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
jdk/test/tools/jmod/JmodTest.java
View File

@ -29,7 +29,7 @@
* @modules jdk.compiler
* jdk.jlink
* @build jdk.testlibrary.FileUtils CompilerUtils
* @run testng JmodTest
* @run testng/othervm -Djava.io.tmpdir=. JmodTest
*/
import java.io.*;
@ -40,8 +40,10 @@ import java.util.*;
import java.util.function.Consumer;
import java.util.regex.Pattern;
import java.util.spi.ToolProvider;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import jdk.testlibrary.FileUtils;
import jdk.testlibrary.JDKToolFinder;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
@ -593,9 +595,7 @@ public class JmodTest {
findTmpFiles(filename).forEach(tmp -> {
try {
FileUtils.deleteFileIfExistsWithRetry(tmp);
} catch (IOException e) {
throw new UncheckedIOException(e);
}
} catch (IOException e) {}
});
String cp = EXPLODED_DIR.resolve("foo").resolve("classes") + File.pathSeparator +
@ -608,17 +608,25 @@ public class JmodTest {
.assertFailure()
.resultChecker(r -> {
assertContains(r.output, "unnamed package");
Set<Path> tmpfiles = findTmpFiles(filename).collect(toSet());
List<Path> tmpfiles = findTmpFiles(filename);
assertTrue(tmpfiles.isEmpty(), "Unexpected tmp file:" + tmpfiles);
});
}
private Stream<Path> findTmpFiles(String prefix) {
try {
Path tmpdir = Paths.get(System.getProperty("java.io.tmpdir"));
return Files.find(tmpdir, 1, (p, attrs) ->
p.getFileName().toString().startsWith(prefix)
&& p.getFileName().toString().endsWith(".tmp"));
/*
* Returns the list of writeable tmp files with the given prefix.
*
* Ignore the non-writeable tmp files because this test is possibly
* running by another user.
*/
private List<Path> findTmpFiles(String prefix) {
Path tmpdir = Paths.get(System.getProperty("java.io.tmpdir"));
try (Stream<Path> stream = Files.list(tmpdir)) {
return stream.filter(p -> {
String fn = p.getFileName().toString();
return Files.isWritable(p)
&& fn.startsWith(prefix) && fn.endsWith(".tmp");
}).collect(Collectors.toList());
} catch (IOException e) {
throw new UncheckedIOException(e);
}