Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing locking tests on windows

This commit is contained in:
Martin Stockhammer 2017-04-16 22:17:16 +02:00
parent 151fae7e17
commit b0f22a2469
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTimeoutTest.java
View File

@ -30,6 +30,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import javax.inject.Inject;
import javax.inject.Named;
import java.io.File;
import java.io.IOException;
import java.nio.file.FileSystemException;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
@ -72,7 +73,13 @@ public class DefaultFileLockManagerTimeoutTest
Lock lock = fileLockManager.writeFileLock(file);
Files.copy(largeJar.toPath(), lock.getFile().toPath(), StandardCopyOption.REPLACE_EXISTING);
try {
Files.copy(largeJar.toPath(), lock.getFile().toPath(), StandardCopyOption.REPLACE_EXISTING);
} catch (IOException e) {
logger.warn("Copy failed "+e.getMessage());
// On windows a FileSystemException is thrown
// We ignore this
}
lock = fileLockManager.writeFileLock(file);
} catch (FileSystemException ex) {