From 429132f496ae35562e5e0ba5996ee4dcab66f639 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 5 Dec 2017 14:25:51 -0400 Subject: [PATCH] try again to avoid directory removal issues on NFS af6068525ae555045fc7a6542e184ada18342d45 seems to not have worked; though the keys database should not have any files open after closeDb, NFS seems to be creating some files where while the directory is being removed, which causes the removal to fail. So instead, try renaming the directory out of the way. This commit was supported by the NSF-funded DataLad project. --- Test.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Test.hs b/Test.hs index 424c3aaccc..41f7dea766 100644 --- a/Test.hs +++ b/Test.hs @@ -675,7 +675,7 @@ test_lock_v6_force = intmpclonerepoInDirect $ do annexeval $ do Database.Keys.closeDb dbdir <- Annex.fromRepo Annex.Locations.gitAnnexKeysDb - liftIO $ removeDirectoryRecursive dbdir + liftIO $ renameDirectory dbdir (dbdir ++ ".old") writeFile annexedfile "test_lock_v6_force content" not <$> git_annex "lock" [annexedfile] @? "lock of modified file failed to fail in v6 mode" git_annex "lock" ["--force", annexedfile] @? "lock --force of modified file failed in v6 mode"