mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix test suite build

Browse source
This commit is contained in:
Joey Hess 2012-06-21 13:04:24 -04:00
parent ebe8ee6753
commit 46d1f5a9d0
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/bugs/The_tests_are_failing_to_build_now_on_commit_e0fdfb2e706da2cb1451193c658dc676b0530968.mdwn
View file

@ -20,3 +20,4 @@ make: *** [test] Error 1
this issue seems to got introduced at commit e0fdfb2e706da2cb1451193c658dc676b0530968 this issue seems to got introduced at commit e0fdfb2e706da2cb1451193c658dc676b0530968
> [[fixed|done]] --[[Joey]]

3
test.hs
View file

@ -28,6 +28,7 @@ import qualified Backend
import qualified Git.CurrentRepo import qualified Git.CurrentRepo
import qualified Git.Filename import qualified Git.Filename
import qualified Locations import qualified Locations
import qualified Types.KeySource
import qualified Types.Backend import qualified Types.Backend
import qualified Types import qualified Types
import qualified GitAnnex import qualified GitAnnex
@ -172,7 +173,7 @@ test_reinject = "git-annex reinject/fromkey" ~: TestCase $ intmpclonerepo $ do
git_annex "drop" ["--force", sha1annexedfile] @? "drop failed" git_annex "drop" ["--force", sha1annexedfile] @? "drop failed"
writeFile tmp $ content sha1annexedfile writeFile tmp $ content sha1annexedfile
r <- annexeval $ Types.Backend.getKey backendSHA1 $ r <- annexeval $ Types.Backend.getKey backendSHA1 $
Types.Backend.KeySource { Types.Backend.keyFilename = tmp, Types.Backend.contentLocation = tmp } Types.KeySource.KeySource { Types.KeySource.keyFilename = tmp, Types.KeySource.contentLocation = tmp }
let key = show $ fromJust r let key = show $ fromJust r
git_annex "reinject" [tmp, sha1annexedfile] @? "reinject failed" git_annex "reinject" [tmp, sha1annexedfile] @? "reinject failed"
git_annex "fromkey" [key, sha1annexedfiledup] @? "fromkey failed" git_annex "fromkey" [key, sha1annexedfiledup] @? "fromkey failed"