You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by an...@apache.org on 2019/11/14 15:44:44 UTC
[zookeeper] branch master updated: ZOOKEEPER-3571: Ensure test base
directory before tests
This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/master by this push:
new aeb9f78 ZOOKEEPER-3571: Ensure test base directory before tests
aeb9f78 is described below
commit aeb9f78c454c59d5d258f0a99bb5e57ed2cbaebe
Author: tison <wa...@gmail.com>
AuthorDate: Thu Nov 14 16:44:36 2019 +0100
ZOOKEEPER-3571: Ensure test base directory before tests
Ensure `build.test.dir` is present as a directory. Otherwise many times it suffers from
```
java.io.IOException: No such file or directory
at java.io.UnixFileSystem.createFileExclusively(Native Method)
at java.io.File.createTempFile(File.java:2024)
at org.apache.zookeeper.test.ClientBase.createTmpDir(ClientBase.java:371)
at org.apache.zookeeper.test.ClientBase.setUpWithServerId(ClientBase.java:514)
at org.apache.zookeeper.test.ClientBase.setUp(ClientBase.java:491)
```
Author: tison <wa...@gmail.com>
Reviewers: eolivelli@apache.org, andor@apache.org
Closes #1112 from TisonKun/ZOOKEEPER-3571
---
.../test/java/org/apache/zookeeper/ZKTestCase.java | 21 ++++++++++++++++++++-
.../java/org/apache/zookeeper/test/ClientBase.java | 7 +++----
2 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/ZKTestCase.java b/zookeeper-server/src/test/java/org/apache/zookeeper/ZKTestCase.java
index b256a7a..d9d481a 100644
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/ZKTestCase.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/ZKTestCase.java
@@ -18,8 +18,11 @@
package org.apache.zookeeper;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.io.File;
import java.time.LocalDateTime;
+import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.rules.TestWatcher;
import org.junit.runner.Description;
@@ -33,10 +36,10 @@ import org.slf4j.LoggerFactory;
* Basic utilities shared by all tests. Also logging of various events during
* the test execution (start/stop/success/failure/etc...)
*/
-@SuppressWarnings("deprecation")
@RunWith(JUnit4ZKTestRunner.class)
public class ZKTestCase {
+ protected static final File testBaseDir = new File(System.getProperty("build.test.dir", "build"));
private static final Logger LOG = LoggerFactory.getLogger(ZKTestCase.class);
private String testName;
@@ -45,6 +48,22 @@ public class ZKTestCase {
return testName;
}
+ @BeforeClass
+ public static void before() {
+ if (!testBaseDir.exists()) {
+ assertTrue(
+ "Cannot properly create test base directory " + testBaseDir.getAbsolutePath(),
+ testBaseDir.mkdirs());
+ } else if (!testBaseDir.isDirectory()) {
+ assertTrue(
+ "Cannot properly delete file with duplicate name of test base directory " + testBaseDir.getAbsolutePath(),
+ testBaseDir.delete());
+ assertTrue(
+ "Cannot properly create test base directory " + testBaseDir.getAbsolutePath(),
+ testBaseDir.mkdirs());
+ }
+ }
+
@Rule
public TestWatcher watchman = new TestWatcher() {
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientBase.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientBase.java
index ef3291f..4235b6b 100644
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientBase.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientBase.java
@@ -70,7 +70,6 @@ public abstract class ClientBase extends ZKTestCase {
protected static final Logger LOG = LoggerFactory.getLogger(ClientBase.class);
public static int CONNECTION_TIMEOUT = 30000;
- static final File BASETEST = new File(System.getProperty("build.test.dir", "build"));
protected String hostPort = "127.0.0.1:" + PortAssignment.unique();
protected int maxCnxns = 0;
@@ -344,11 +343,11 @@ public abstract class ClientBase extends ZKTestCase {
}
public static File createEmptyTestDir() throws IOException {
- return createTmpDir(BASETEST, false);
+ return createTmpDir(testBaseDir, false);
}
public static File createTmpDir() throws IOException {
- return createTmpDir(BASETEST, true);
+ return createTmpDir(testBaseDir, true);
}
static File createTmpDir(File parentDir, boolean createInitFile) throws IOException {
@@ -495,7 +494,7 @@ public abstract class ClientBase extends ZKTestCase {
setUpAll();
- tmpDir = createTmpDir(BASETEST, true);
+ tmpDir = createTmpDir(testBaseDir, true);
startServer(serverId);