summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-06-09 16:16:39 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-06-09 16:16:39 -0400
commit905e1f2127a834cf998e3921adef4e20b918df3a (patch)
treee9a7cbfb082a861ce7acb85ebe4a7ede47b51531
parent64360c0a47d84524b9ab2250653812da7c331174 (diff)
update test suite for lock/unlock with missing file content change in v6
-rw-r--r--Test.hs9
1 files changed, 5 insertions, 4 deletions
diff --git a/Test.hs b/Test.hs
index 0a9b6267a..e432f5443 100644
--- a/Test.hs
+++ b/Test.hs
@@ -564,10 +564,11 @@ test_preferred_content = intmpclonerepo $ do
test_lock :: Assertion
test_lock = intmpclonerepoInDirect $ do
annexed_notpresent annexedfile
- ifM (unlockedFiles <$> getTestMode)
- ( not <$> git_annex "lock" [annexedfile] @? "lock failed to fail with not present file"
- , not <$> git_annex "unlock" [annexedfile] @? "unlock failed to fail with not present file"
- )
+ unlessM (annexeval Annex.Version.versionSupportsUnlockedPointers) $
+ ifM (unlockedFiles <$> getTestMode)
+ ( not <$> git_annex "lock" [annexedfile] @? "lock failed to fail with not present file"
+ , not <$> git_annex "unlock" [annexedfile] @? "unlock failed to fail with not present file"
+ )
annexed_notpresent annexedfile
-- regression test: unlock of newly added, not committed file