Skip to content
Snippets Groups Projects
Commit 228f7acc authored by Mick Jordan's avatar Mick Jordan
Browse files

Only warn when created test directory cannot be deleted

parent 4e0a8d4e
Branches
No related tags found
No related merge requests found
......@@ -850,7 +850,7 @@ public class TestBase {
protected static boolean deleteDir(Path dir) {
try {
Files.walkFileTree(dir, DELETE_VISITOR);
} catch (Exception e) {
} catch (Throwable e) {
return false;
}
return true;
......
......@@ -52,7 +52,7 @@ public class TestConnections extends TestBase {
@AfterClass
public static void teardownTestDir() {
if (!deleteDir(testDir.testDirPath)) {
throw new AssertionError();
System.err.println("WARNING: error deleting : " + testDir.testDirPath);
}
}
......
......@@ -150,8 +150,7 @@ public abstract class TestRPackages extends TestBase {
Path packageDir = installDir().resolve(packageName);
try {
deleteDir(packageDir);
} catch (Exception e) {
e.printStackTrace();
} catch (Throwable e) {
return false;
}
return true;
......@@ -205,7 +204,7 @@ public abstract class TestRPackages extends TestBase {
if (!checkOnly()) {
for (String p : testPackages) {
if (!uninstallPackage(p)) {
throw new AssertionError();
System.err.println("WARNING: error deleting package: " + p);
}
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment