summaryrefslogtreecommitdiff
path: root/Test.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-05-23 17:27:15 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-05-23 17:33:32 -0400
commit9a8ff4c743fae057520caebb59a760caf29001b4 (patch)
tree6fb8bde572a73366a6749c07ecf711fe550a1bd5 /Test.hs
parent063d84ddd33f1aa0624cf5f363f2c58397b98562 (diff)
plumb RemoteGitConfig through to decryptCipher
Diffstat (limited to 'Test.hs')
-rw-r--r--Test.hs4
1 files changed, 3 insertions, 1 deletions
diff --git a/Test.hs b/Test.hs
index f98b8c510..27cca4e66 100644
--- a/Test.hs
+++ b/Test.hs
@@ -50,6 +50,7 @@ import qualified Git.LsTree
import qualified Git.FilePath
import qualified Annex.Locations
import qualified Types.KeySource
+import qualified Types.Remote
import qualified Types.Backend
import qualified Types.TrustLevel
import qualified Types
@@ -1525,6 +1526,7 @@ test_crypto = do
testscheme "pubkey"
where
gpgcmd = Utility.Gpg.mkGpgCmd Nothing
+ encparams = (mempty :: Types.Remote.RemoteConfig, def :: Types.RemoteGitConfig)
testscheme scheme = intmpclonerepo $ whenM (Utility.Path.inPath (Utility.Gpg.unGpgCmd gpgcmd)) $ do
Utility.Gpg.testTestHarness gpgcmd
@? "test harness self-test failed"
@@ -1580,7 +1582,7 @@ test_crypto = do
checkScheme Types.Crypto.Hybrid = scheme == "hybrid"
checkScheme Types.Crypto.PubKey = scheme == "pubkey"
checkKeys cip mvariant = do
- cipher <- Crypto.decryptCipher gpgcmd cip
+ cipher <- Crypto.decryptCipher gpgcmd encparams cip
files <- filterM doesFileExist $
map ("dir" </>) $ concatMap (key2files cipher) keys
return (not $ null files) <&&> allM (checkFile mvariant) files