summaryrefslogtreecommitdiff
path: root/test.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-01-09 18:19:29 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-01-09 18:19:29 -0400
commit9ffd97442b3f2e4e9de6895d843aee382ad10dfd (patch)
tree769a1ea960ad69355fb5711318a69162523fba8e /test.hs
parent7675b83efa77527c0b04b87e35f83df67e6af8d7 (diff)
don't use GPG_AGENT_INFO to force batch mode in test suite
Fails with gpg 2. Instead, use a different environment variable. The clean fix would instead be to add an annex.gpg-options configuration. But, that would be rather a lot of work and it's unlikely it would be useful for much else.
Diffstat (limited to 'test.hs')
-rw-r--r--test.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/test.hs b/test.hs
index 2ce3f8b0b..5d01f1116 100644
--- a/test.hs
+++ b/test.hs
@@ -664,7 +664,7 @@ test_bup_remote = "git-annex bup remote" ~: intmpclonerepo $ when Build.SysConfi
test_crypto :: Test
test_crypto = "git-annex crypto" ~: intmpclonerepo $ when Build.SysConfig.gpg $ do
-- force gpg into batch mode for the tests
- setEnv "GPG_AGENT_INFO" "/dev/null" True
+ setEnv "GPG_BATCH" "1" True
Utility.Gpg.testTestHarness @? "test harness self-test failed"
Utility.Gpg.testHarness $ do
createDirectory "dir"