提交 fc6bfa94 authored 作者: Thomas Mueller's avatar Thomas Mueller

Don't stop the test when deleting files fails.

上级 2af978ff
...@@ -297,6 +297,8 @@ java org.h2.test.TestAll timer ...@@ -297,6 +297,8 @@ java org.h2.test.TestAll timer
test.printSystem(); test.printSystem();
System.setProperty("h2.maxMemoryRowsDistinct", "128"); System.setProperty("h2.maxMemoryRowsDistinct", "128");
System.setProperty("h2.check2", "true"); System.setProperty("h2.check2", "true");
// System.setProperty("h2.syncMethod", "");
/* /*
test with small freeList pages, page size 64 test with small freeList pages, page size 64
...@@ -659,11 +661,11 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1` ...@@ -659,11 +661,11 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1`
} }
private void afterTest() { private void afterTest() {
FileSystemDisk.getInstance().deleteRecursive("trace.db", false); FileSystemDisk.getInstance().deleteRecursive("trace.db", true);
if (networked && server != null) { if (networked && server != null) {
server.stop(); server.stop();
} }
FileSystemDisk.getInstance().deleteRecursive(TestBase.BASE_TEST_DIR, false); FileSystemDisk.getInstance().deleteRecursive(TestBase.BASE_TEST_DIR, true);
} }
private void printSystem() { private void printSystem() {
......
...@@ -62,7 +62,7 @@ public class TestFunctions extends TestBase implements AggregateFunction { ...@@ -62,7 +62,7 @@ public class TestFunctions extends TestBase implements AggregateFunction {
testFunctions(); testFunctions();
testFileRead(); testFileRead();
deleteDb("functions"); deleteDb("functions");
FileSystem.getInstance(TEMP_DIR).deleteRecursive(TEMP_DIR, false); FileSystem.getInstance(TEMP_DIR).deleteRecursive(TEMP_DIR, true);
} }
private void testGreatest() throws SQLException { private void testGreatest() throws SQLException {
......
...@@ -77,12 +77,12 @@ public class TestLob extends TestBase { ...@@ -77,12 +77,12 @@ public class TestLob extends TestBase {
testLob(true); testLob(true);
testJavaObject(); testJavaObject();
deleteDb("lob"); deleteDb("lob");
FileSystem.getInstance(TEMP_DIR).deleteRecursive(TEMP_DIR, false); FileSystem.getInstance(TEMP_DIR).deleteRecursive(TEMP_DIR, true);
} }
private void testTempFilesDeleted() throws Exception { private void testTempFilesDeleted() throws Exception {
String[] list; String[] list;
FileSystem.getInstance(TEMP_DIR).deleteRecursive(TEMP_DIR, false); FileSystem.getInstance(TEMP_DIR).deleteRecursive(TEMP_DIR, true);
IOUtils.mkdirs(new File(TEMP_DIR)); IOUtils.mkdirs(new File(TEMP_DIR));
list = IOUtils.listFiles(TEMP_DIR); list = IOUtils.listFiles(TEMP_DIR);
if (list.length > 0) { if (list.length > 0) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论