From d5e031656940e9cff4d4ca6023dea0fb4d2c4dc3 Mon Sep 17 00:00:00 2001
From: joe <joe@blackbird>
Date: Tue, 26 Apr 2016 00:15:10 -0400
Subject: testkiki fixes

---
 testkiki/testkiki.hs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/testkiki/testkiki.hs b/testkiki/testkiki.hs
index 4215637..8b43068 100644
--- a/testkiki/testkiki.hs
+++ b/testkiki/testkiki.hs
@@ -53,7 +53,7 @@ main = do
         exitFailure
     else do
         let chrootdir    = cwd </> tdir </> "chroot"
-            gnupghomedir = cwd </> tdir </> "gnupghome"
+            gnupghomedir = "gnupghome"
         createDirectoryIfMissing True chrootdir
         createDirectoryIfMissing True gnupghomedir
         let config = TKS { chroot = chrootdir , gnupghome = gnupghomedir }
@@ -86,7 +86,7 @@ doTests tkConfig = hspec $ do
         it "creates new secring honoring GNUPGHOME" $ do
             let kiki = kiki'Env'And'HomeArg tkConfig 
             output <- kiki ["init"]
-            b <- doesFileExist (gnupghome tkConfig </> "secring.gpg")
+            b <- doesFileExist (chroot tkConfig </> gnupghome tkConfig </> "secring.gpg")
             (isInfixOf "New packet" output && b ) `shouldBe` True
 
         it "creates new secring in /root/.gnupg" $ do
@@ -94,7 +94,9 @@ doTests tkConfig = hspec $ do
             unsetEnv "GNUPGHOME"
             createDirectoryIfMissing True (chroot tkConfig </> "root" </> ".gnupg")
             output <- kiki ["init"]
-            b <- doesFileExist (chroot tkConfig </> "root" </> ".gnupg" </> "secring.gpg")
+	    let p = (chroot tkConfig </> "root" </> ".gnupg" </> "secring.gpg")
+            putStrLn $ "Does exist? " ++ show p
+            b <- doesFileExist p
             (isInfixOf "New packet" output && b ) `shouldBe` True
 
     describe "kiki export-public" $ do
@@ -144,12 +146,12 @@ doTests tkConfig = hspec $ do
             readProcess "./dist/build/kiki/kiki" args' ""
 
         kiki'No'Env config args = do
-            let args' = args ++ ["--chroot=" ++ chroot config,"--homedir", 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,"--homedir", 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