summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Crayne <jim.crayne@gmail.com>2016-04-25 22:35:34 -0400
committerJames Crayne <jim.crayne@gmail.com>2016-04-26 06:04:05 -0400
commit65291ca8b93b87658e314d0bd44e5bb06021bdb7 (patch)
tree1994e0000a0686b9923efc39ca5b14234803187e
parent32383006bd5bccb5abf63aeb5bac1740539a4986 (diff)
Fix --home => --homedir, more cokiki tests
-rw-r--r--testkiki/testkiki.hs12
1 files changed, 9 insertions, 3 deletions
diff --git a/testkiki/testkiki.hs b/testkiki/testkiki.hs
index 0e4c70a..3ba7155 100644
--- a/testkiki/testkiki.hs
+++ b/testkiki/testkiki.hs
@@ -106,7 +106,13 @@ doTests tkConfig = hspec $ do
106 (isInfixOf "New packet" output && b ) `shouldBe` True 106 (isInfixOf "New packet" output && b ) `shouldBe` True
107 107
108 describe "cokiki ssh-client" $ do 108 describe "cokiki ssh-client" $ do
109 it "does something" $ 109 it "modifies system ssh configuration to respect /var/cache/kiki/ssh_known_hosts" $ do
110 pending
111 it "sets kiki ssh-server key to /etc/ssh/ssh_host_rsa_key" $ do
112 pending
113 it "replaces existing ssh-server key with /etc/ssh/ssh_hosts_rsa_key" $ do
114 pending
115 it "refreshes /var/cache/kiki/*" $ do
110 pending 116 pending
111 117
112 describe "cokiki ssh-server" $ do 118 describe "cokiki ssh-server" $ do
@@ -129,12 +135,12 @@ doTests tkConfig = hspec $ do
129 readProcess "./dist/build/kiki/kiki" args' "" 135 readProcess "./dist/build/kiki/kiki" args' ""
130 136
131 kiki'No'Env config args = do 137 kiki'No'Env config args = do
132 let args' = args ++ ["--chroot=" ++ chroot config,"--home=" ++ gnupghome config] 138 let args' = args ++ ["--chroot=" ++ chroot config,"--homedir", gnupghome config]
133 readProcess "./dist/build/kiki/kiki" args' "" 139 readProcess "./dist/build/kiki/kiki" args' ""
134 140
135 kiki'Env'And'HomeArg config args = do 141 kiki'Env'And'HomeArg config args = do
136 setEnv "GNUPGHOME" (gnupghome config) 142 setEnv "GNUPGHOME" (gnupghome config)
137 let args' = args ++ ["--chroot=" ++ chroot config,"--home=" ++ gnupghome config] 143 let args' = args ++ ["--chroot=" ++ chroot config,"--homedir", gnupghome config]
138 r <- readProcess "./dist/build/kiki/kiki" args' "" 144 r <- readProcess "./dist/build/kiki/kiki" args' ""
139 unsetEnv "GNUPGHOME" 145 unsetEnv "GNUPGHOME"
140 return r 146 return r