HADOOP-17036. TestFTPFileSystem failing as ftp server dir already exists.

Contributed by Mikhail Pryakhin.

(cherry picked from commit 017d24e970)
This commit is contained in:
Mike 2020-05-14 20:28:00 +03:00 committed by Akira Ajisaka
parent df50e210dd
commit 0f12f3e125
No known key found for this signature in database
GPG Key ID: C1EDBB9CA400FD50

View File

@ -55,13 +55,16 @@
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 void setUp() throws Exception {
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);