diff options
author | Joey Hess <joeyh@joeyh.name> | 2017-08-14 15:11:42 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2017-08-14 15:11:42 -0400 |
commit | 6c4c1a9bccfaa94525f343153b179c2170293686 (patch) | |
tree | 7ea95dd024adbcff1fa66e3dd5ef1457c33b1014 /Test.hs | |
parent | a93ff12905005d1cbd2339ddeb8e8abfe2b20079 (diff) |
Fix a git-annex test failure when run on NFS due to NFS lock files preventing directory removal.
Should fix this:
lock (v6 --force): FAIL
Exception: .git/annex/keys: removeDirectoryRecursive: unsatisfied constraints (Directory not empty)
Verified that the test case still catches the regression it's meant to.
This commit was supported by the NSF-funded DataLad project.
Diffstat (limited to 'Test.hs')
-rw-r--r-- | Test.hs | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -70,6 +70,7 @@ import qualified Types.Messages import qualified Config import qualified Config.Cost import qualified Crypto +import qualified Database.Keys import qualified Annex.WorkTree import qualified Annex.Link import qualified Annex.Init @@ -652,6 +653,7 @@ test_lock_v6_force = intmpclonerepoInDirect $ do git_annex "get" [annexedfile] @? "get of file failed" git_annex "unlock" [annexedfile] @? "unlock failed in v6 mode" annexeval $ do + Database.Keys.closeDb dbdir <- Annex.fromRepo Annex.Locations.gitAnnexKeysDb liftIO $ removeDirectoryRecursive dbdir writeFile annexedfile "test_lock_v6_force content" |