You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by st...@apache.org on 2020/05/14 17:28:13 UTC
[hadoop] branch trunk updated: HADOOP-17036. TestFTPFileSystem
failing as ftp server dir already exists.
This is an automated email from the ASF dual-hosted git repository.
stevel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 017d24e HADOOP-17036. TestFTPFileSystem failing as ftp server dir already exists.
017d24e is described below
commit 017d24e9703e9447f88ba94df3a8aa0800de770b
Author: Mike <m....@gmail.com>
AuthorDate: Thu May 14 20:28:00 2020 +0300
HADOOP-17036. TestFTPFileSystem failing as ftp server dir already exists.
Contributed by Mikhail Pryakhin.
---
.../test/java/org/apache/hadoop/fs/ftp/TestFTPFileSystem.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/ftp/TestFTPFileSystem.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/ftp/TestFTPFileSystem.java
index 02d5a48..d3750e6 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/ftp/TestFTPFileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/ftp/TestFTPFileSystem.java
@@ -55,13 +55,16 @@ import static org.junit.Assert.assertEquals;
public class TestFTPFileSystem {
private FtpTestServer server;
-
+ private java.nio.file.Path testDir;
@Rule
public Timeout testTimeout = new Timeout(180000);
@Before
public void setUp() throws Exception {
- server = new FtpTestServer(GenericTestUtils.getTestDir().toPath()).start();
+ testDir = Files.createTempDirectory(
+ GenericTestUtils.getTestDir().toPath(), getClass().getName()
+ );
+ server = new FtpTestServer(testDir).start();
}
@After
@@ -69,7 +72,7 @@ public class TestFTPFileSystem {
public void tearDown() throws Exception {
if (server != null) {
server.stop();
- Files.walk(server.getFtpRoot())
+ Files.walk(testDir)
.sorted(Comparator.reverseOrder())
.map(java.nio.file.Path::toFile)
.forEach(File::delete);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org