stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6501010: test/java/io/File/GetXSpace.java fails on Windows

Browse Source 
Reviewed-by: bpb
This commit is contained in:
Igor Ignatyev 2020-07-30 19:39:44 -07:00
parent e3c6574ac0
commit d5c4c292a0
3 changed files with 64 additions and 75 deletions

2
test/jdk/ProblemList.txt

@ -590,7 +590,7 @@ javax/management/monitor/DerivedGaugeMonitorTest.java 8042211 generic-al
# jdk_io
java/io/pathNames/GeneralWin32.java 8180264 windows-all
java/io/File/GetXSpace.java 6501010,8249703 windows-all,macosx-all
java/io/File/GetXSpace.java 8249703 macosx-all
############################################################################

134
test/jdk/java/io/File/GetXSpace.java

@ -47,21 +47,9 @@ public class GetXSpace {
private static SecurityManager [] sma = { null, new Allow(), new DenyFSA(),
new DenyRead() };
private static final String name = System.getProperty("os.name");
private static final String dfFormat;
static {
if (name.equals("Linux") || name.contains("OS X")) {
// FileSystem Total Used Available Use% MountedOn
dfFormat = "([^\\s]+)\\s+(\\d+)\\s+\\d+\\s+(\\d+)\\s+\\d+%\\s+([^\\s]+)";
} else if (name.startsWith("Windows")) {
// Drive (MountedOn) Available/Total
dfFormat = "([^\\s]+)\\s+\\(([^\\s]+)\\)\\s+(\\d+)\\/(\\d+)\\s+";
} else {
throw new RuntimeException("unrecognized system:"
+ " os.name == " + name);
}
}
private static Pattern dfPattern = Pattern.compile(dfFormat);
private static final String osName = System.getProperty("os.name");
// FileSystem Total Used Available Use% MountedOn
private static final Pattern dfPattern = Pattern.compile("([^\\s]+)\\s+(\\d+)\\s+\\d+\\s+(\\d+)\\s+\\d+%\\s+([^\\s].*)\n");
private static int fail = 0;
private static int pass = 0;
@ -72,49 +60,43 @@ public class GetXSpace {
}
static void fail(String p) {
if (first == null)
setFirst(p);
setFirst(p);
System.err.format("FAILED: %s%n", p);
fail++;
}
static void fail(String p, long exp, String cmp, long got) {
String s = String.format("'%s': %d %s %d", p, exp, cmp, got);
if (first == null)
setFirst(s);
setFirst(s);
System.err.format("FAILED: %s%n", s);
fail++;
}
private static void fail(String p, Class ex) {
String s = String.format("'%s': expected %s - FAILED%n", p, ex.getName());
if (first == null)
setFirst(s);
setFirst(s);
System.err.format("FAILED: %s%n", s);
fail++;
}
private static void setFirst(String s) {
try {
throw new RuntimeException(s);
} catch (RuntimeException x) {
first = x;
if (first == null) {
first = new RuntimeException(s);
}
}
private static class Space {
private static final long KSIZE = 1024;
private String name;
private long total;
private long free;
private final String name;
private final long total;
private final long free;
Space(String total, String free, String name) {
try {
this.total = Long.valueOf(total) * KSIZE;
this.free = Long.valueOf(free) * KSIZE;
} catch (NumberFormatException x) {
// the regex should have caught this
assert false;
throw new RuntimeException("the regex should have caught this", x);
}
this.name = name;
}
@ -130,36 +112,35 @@ public class GetXSpace {
}
}
private static ArrayList space(String f) throws IOException {
ArrayList al = new ArrayList();
private static ArrayList<Space> space(String f) throws IOException {
ArrayList<Space> al = new ArrayList<>();
Process p = null;
String cmd = "df -k -P" + (f == null ? "" : " " + f);
p = Runtime.getRuntime().exec(cmd);
BufferedReader in = new BufferedReader
(new InputStreamReader(p.getInputStream()));
String s;
int i = 0;
StringBuilder sb = new StringBuilder();
while ((s = in.readLine()) != null) {
// skip header
if (i++ == 0 && !name.startsWith("Windows")) continue;
sb.append(s).append("\n");
Process p = Runtime.getRuntime().exec(cmd);
try (BufferedReader in = new BufferedReader(new InputStreamReader(p.getInputStream()))) {
String s;
int i = 0;
while ((s = in.readLine()) != null) {
// skip header
if (i++ == 0) continue;
sb.append(s).append("\n");
}
}
out.println(sb);
Matcher m = dfPattern.matcher(sb);
int j = 0;
while (j < sb.length()) {
if (m.find(j)) {
if (!name.startsWith("Windows")) {
// swap can change while this test is running
if (!m.group(1).equals("swap")) {
String name = (f == null ? m.group(4): f);
al.add(new Space(m.group(2), m.group(3), name));;
// swap can change while this test is running
if (!m.group(1).equals("swap")) {
String name = f;
if (name == null) {
// cygwin's df lists windows path as FileSystem (1st group)
name = osName.startsWith("Windows") ? m.group(1) : m.group(4);
}
} else {
String name = (f == null ? m.group(2) : f);
al.add(new Space(m.group(4), m.group(3), name ));;
al.add(new Space(m.group(2), m.group(3), name));;
}
j = m.end() + 1;
} else {
@ -174,7 +155,6 @@ public class GetXSpace {
String name = (f == null ? "" : f);
al.add(new Space("0", "0", name));
}
in.close();
return al;
}
@ -220,27 +200,31 @@ public class GetXSpace {
out.format(fmt, "getX", ts, fs, us);
// if the file system can dynamically change size, this check will fail
if (ts != s.total())
if (ts != s.total()) {
fail(s.name(), s.total(), "!=", ts);
else
} else {
pass();
}
// unix df returns statvfs.f_bavail
long tsp = (!name.startsWith("Windows") ? us : fs);
if (!s.woomFree(tsp))
long tsp = (!osName.startsWith("Windows") ? us : fs);
if (!s.woomFree(tsp)) {
fail(s.name(), s.free(), "??", tsp);
else
} else {
pass();
}
if (fs > s.total())
if (fs > s.total()) {
fail(s.name(), s.total(), ">", fs);
else
} else {
pass();
}
if (us > s.total())
if (us > s.total()) {
fail(s.name(), s.total(), ">", us);
else
} else {
pass();
}
}
private static String FILE_PREFIX = "/getSpace.";
@ -248,18 +232,20 @@ public class GetXSpace {
File f;
while (true) {
f = new File(FILE_PREFIX + Math.random());
if (f.exists())
if (f.exists()) {
continue;
}
break;
}
long [] s = { f.getTotalSpace(), f.getFreeSpace(), f.getUsableSpace() };
for (int i = 0; i < s.length; i++) {
if (s[i] != 0L)
if (s[i] != 0L) {
fail(f.getName(), s[i], "!=", 0L);
else
} else {
pass();
}
}
}
@ -270,12 +256,14 @@ public class GetXSpace {
long [] s = { f.getTotalSpace(), f.getFreeSpace(), f.getUsableSpace() };
for (int i = 0; i < s.length; i++) {
if (s[i] == 0L)
if (s[i] == 0L) {
fail(f.getName(), s[i], "==", 0L);
else
} else {
pass();
}
}
} catch (IOException x) {
x.printStackTrace();
fail("Couldn't create temp file for test");
}
}
@ -328,20 +316,20 @@ public class GetXSpace {
private static void testFile(String dirName) {
out.format("--- Testing %s%n", dirName);
ArrayList l;
ArrayList<Space> l;
try {
l = space(dirName);
} catch (IOException x) {
throw new RuntimeException(dirName + " can't get file system information", x);
}
compare((GetXSpace.Space) l.get(0));
compare(l.get(0));
}
private static void testDF() {
out.format("--- Testing df");
out.println("--- Testing df");
// Find all of the partitions on the machine and verify that the size
// returned by "df" is equivalent to File.getXSpace() values.
ArrayList l;
ArrayList<Space> l;
try {
l = space(null);
} catch (IOException x) {
@ -359,8 +347,7 @@ public class GetXSpace {
out.format("%nSecurityManager = %s%n" ,
(sm == null ? "null" : sm.getClass().getName()));
for (int j = 0; j < l.size(); j++) {
Space s = (GetXSpace.Space) l.get(j);
for (var s : l) {
if (sm instanceof Deny) {
tryCatch(s);
} else {
@ -379,10 +366,11 @@ public class GetXSpace {
testDF();
}
if (fail != 0)
if (fail != 0) {
throw new RuntimeException((fail + pass) + " tests: "
+ fail + " failure(s), first", first);
else
} else {
out.format("all %d tests passed%n", fail + pass);
}
}
}

3
test/jdk/java/io/File/GetXSpace.sh

@ -28,9 +28,10 @@ OS=`uname -s`
case "$OS" in
Linux | Darwin ) TMP=/tmp ;;
Windows_98 ) return ;;
CYGWIN_* ) TMP="c:/temp" ;;
Windows* ) SID=`sid`; TMP="c:/temp" ;;
* )
echo "Unrecognized system!"
echo "Unrecognized system! ${OS}"
exit 1
;;
esac