fix test that broke due to fromkey improvements

4588668a12 made fromkey honor adjusted
unlocked branches. Also, it can be used on a crippled filesystem now.
This commit is contained in:
Joey Hess 2021-05-03 13:37:30 -04:00
parent 424bef6b6f
commit e811a50e2c
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38

View file

@ -545,11 +545,10 @@ test_reinject = intmpclonerepo $ do
key <- Key.serializeKey <$> getKey backendSHA1 tmp key <- Key.serializeKey <$> getKey backendSHA1 tmp
git_annex "reinject" [tmp, sha1annexedfile] "reinject" git_annex "reinject" [tmp, sha1annexedfile] "reinject"
annexed_present sha1annexedfile annexed_present sha1annexedfile
-- fromkey can't be used on a crippled filesystem, since it makes a
-- symlink
unlessM (annexeval Config.crippledFileSystem) $ do
git_annex "fromkey" [key, sha1annexedfiledup] "fromkey for dup" git_annex "fromkey" [key, sha1annexedfiledup] "fromkey for dup"
annexed_present_locked sha1annexedfiledup whenM (unlockedFiles <$> getTestMode) $
git_annex "unlock" [sha1annexedfiledup] "unlock"
annexed_present sha1annexedfiledup
where where
tmp = "tmpfile" tmp = "tmpfile"