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.
This commit is contained in:
parent
7675b83efa
commit
9ffd97442b
2 changed files with 7 additions and 3 deletions
2
test.hs
2
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"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue