summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-06-21 13:04:24 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-06-21 13:04:24 -0400
commit46d1f5a9d05f69a1933bd79e1e0ec82893934e0f (patch)
treed5a213771480efb6c88c920350362fb07aa35ca7
parentebe8ee675366da190b5c462f2cc66dd528412db4 (diff)
fix test suite build
-rw-r--r--doc/bugs/The_tests_are_failing_to_build_now_on_commit_e0fdfb2e706da2cb1451193c658dc676b0530968.mdwn1
-rw-r--r--test.hs3
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/bugs/The_tests_are_failing_to_build_now_on_commit_e0fdfb2e706da2cb1451193c658dc676b0530968.mdwn b/doc/bugs/The_tests_are_failing_to_build_now_on_commit_e0fdfb2e706da2cb1451193c658dc676b0530968.mdwn
index 1426f3488..be6db378c 100644
--- a/doc/bugs/The_tests_are_failing_to_build_now_on_commit_e0fdfb2e706da2cb1451193c658dc676b0530968.mdwn
+++ b/doc/bugs/The_tests_are_failing_to_build_now_on_commit_e0fdfb2e706da2cb1451193c658dc676b0530968.mdwn
@@ -20,3 +20,4 @@ make: *** [test] Error 1
this issue seems to got introduced at commit e0fdfb2e706da2cb1451193c658dc676b0530968
+> [[fixed|done]] --[[Joey]]
diff --git a/test.hs b/test.hs
index 1a7c382c0..089c86bfb 100644
--- a/test.hs
+++ b/test.hs
@@ -28,6 +28,7 @@ import qualified Backend
import qualified Git.CurrentRepo
import qualified Git.Filename
import qualified Locations
+import qualified Types.KeySource
import qualified Types.Backend
import qualified Types
import qualified GitAnnex
@@ -172,7 +173,7 @@ test_reinject = "git-annex reinject/fromkey" ~: TestCase $ intmpclonerepo $ do
git_annex "drop" ["--force", sha1annexedfile] @? "drop failed"
writeFile tmp $ content sha1annexedfile
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
git_annex "reinject" [tmp, sha1annexedfile] @? "reinject failed"
git_annex "fromkey" [key, sha1annexedfiledup] @? "fromkey failed"