From 29a3f071a7f32a22eeee00a55dc110b9d59fab54 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 11 Jan 2021 13:14:58 -0400 Subject: [PATCH] update test suite after git-annex trust behavior change --- Test.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Test.hs b/Test.hs index 2a4bb60a3b..5870d4c6c5 100644 --- a/Test.hs +++ b/Test.hs @@ -845,9 +845,9 @@ test_fix = intmpclonerepo $ unlessM (hasUnlockedFiles <$> getTestMode) $ do test_trust :: Assertion test_trust = intmpclonerepo $ do - git_annex "trust" [repo] "trust" + git_annex "trust" ["--force", repo] "trust" trustcheck Logs.Trust.Trusted "trusted 1" - git_annex "trust" [repo] "trust of trusted" + git_annex "trust" ["--force", repo] "trust of trusted" trustcheck Logs.Trust.Trusted "trusted 2" git_annex "untrust" [repo] "untrust" trustcheck Logs.Trust.UnTrusted "untrusted 1" @@ -899,7 +899,7 @@ test_fsck_localuntrusted = intmpclonerepo $ do git_annex "untrust" ["origin"] "untrust of origin repo" git_annex "untrust" ["."] "untrust of current repo" fsck_should_fail "content only available in untrusted (current) repository" - git_annex "trust" ["."] "trust of current repo" + git_annex "trust" ["--force", "."] "trust of current repo" git_annex "fsck" [annexedfile] "fsck on file present in trusted repo" test_fsck_remoteuntrusted :: Assertion -- 2.30.2