summaryrefslogtreecommitdiff
path: root/test.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-03-15 22:53:14 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-03-15 22:53:14 -0400
commit49b7f5918341c30140779ea1f376b4d9f81d8a30 (patch)
tree454772293be974bb79bf8c7f42aea9740d0bca77 /test.hs
parent9d24cc7bdb011d66e41229a3b96401808be47268 (diff)
test suite passes again
doesn't test remote functionality.. but that may be working too now
Diffstat (limited to 'test.hs')
-rw-r--r--test.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/test.hs b/test.hs
index 2bc0c37a3..49f7f2ab9 100644
--- a/test.hs
+++ b/test.hs
@@ -121,9 +121,9 @@ test_setkey :: Test
test_setkey = "git-annex setkey/fromkey" ~: TestCase $ inmainrepo $ do
writeFile tmp $ content sha1annexedfile
r <- annexeval $ BackendClass.getKey backendSHA1 tmp
- let sha1 = Key.keyName $ fromJust r
- git_annex "setkey" ["-q", "--backend", "SHA1", "--key", sha1, tmp] @? "setkey failed"
- git_annex "fromkey" ["-q", "--backend", "SHA1", "--key", sha1, sha1annexedfile] @? "fromkey failed"
+ let key = show $ fromJust r
+ git_annex "setkey" ["-q", "--key", key, tmp] @? "setkey failed"
+ git_annex "fromkey" ["-q", "--key", key, sha1annexedfile] @? "fromkey failed"
Utility.boolSystem "git" [Utility.Params "commit -q -a -m commit"] @? "git commit failed"
annexed_present sha1annexedfile
where
@@ -439,7 +439,7 @@ test_unused = "git-annex unused/dropunused" ~: intmpclonerepo $ do
checkunused [annexedfilekey, sha1annexedfilekey]
-- good opportunity to test dropkey also
- git_annex "dropkey" ["-q", "--force", Key.keyName annexedfilekey]
+ git_annex "dropkey" ["-q", "--force", show annexedfilekey]
@? "dropkey failed"
checkunused [sha1annexedfilekey]