From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 11 Jan 2021 17:14:58 +0000 (-0400)
Subject: update test suite after git-annex trust behavior change
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~98^2~222
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=29a3f071a7f32a22eeee00a55dc110b9d59fab54;p=git-annex.git

update test suite after git-annex trust behavior change
---

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