From 65291ca8b93b87658e314d0bd44e5bb06021bdb7 Mon Sep 17 00:00:00 2001 From: James Crayne Date: Mon, 25 Apr 2016 22:35:34 -0400 Subject: Fix --home => --homedir, more cokiki tests --- testkiki/testkiki.hs | 12 +++++++++--- 1 file 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 (isInfixOf "New packet" output && b ) `shouldBe` True describe "cokiki ssh-client" $ do - it "does something" $ + it "modifies system ssh configuration to respect /var/cache/kiki/ssh_known_hosts" $ do + pending + it "sets kiki ssh-server key to /etc/ssh/ssh_host_rsa_key" $ do + pending + it "replaces existing ssh-server key with /etc/ssh/ssh_hosts_rsa_key" $ do + pending + it "refreshes /var/cache/kiki/*" $ do pending describe "cokiki ssh-server" $ do @@ -129,12 +135,12 @@ doTests tkConfig = hspec $ do readProcess "./dist/build/kiki/kiki" args' "" kiki'No'Env config args = do - let args' = args ++ ["--chroot=" ++ chroot config,"--home=" ++ gnupghome config] + let args' = args ++ ["--chroot=" ++ chroot config,"--homedir", gnupghome config] readProcess "./dist/build/kiki/kiki" args' "" kiki'Env'And'HomeArg config args = do setEnv "GNUPGHOME" (gnupghome config) - let args' = args ++ ["--chroot=" ++ chroot config,"--home=" ++ gnupghome config] + let args' = args ++ ["--chroot=" ++ chroot config,"--homedir", gnupghome config] r <- readProcess "./dist/build/kiki/kiki" args' "" unsetEnv "GNUPGHOME" return r -- cgit v1.2.3