From: Martin Stockhammer <martin_s@apache.org>
Date: Sun, 16 Apr 2017 20:17:16 +0000 (+0200)
Subject: Fixing locking tests on windows
X-Git-Tag: archiva-2.2.2~6
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b0f22a24699685fd8a77cbe7530b82e26c10bb0f;p=archiva.git

Fixing locking tests on windows
---

diff --git a/archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTimeoutTest.java b/archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTimeoutTest.java
index cd2cba209..666efee18 100644
--- a/archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTimeoutTest.java
+++ b/archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTimeoutTest.java
@@ -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) {