Merge branch 'master' of oxio4inifatsetlx.onion:samizdat/kiki

1 files changed, 12 insertions, 8 deletions

diff --git a/testkiki/testkiki.hs b/testkiki/testkiki.hs
index 64c1a6a..ea6ad80 100644
--- a/testkiki/testkiki.hs
+++ b/testkiki/testkiki.hs
@@ -268,7 +268,6 @@ doTests tkConfig = hspec $ do
                 gnuhome = home </> ".gnupg"
                 cfg = cfg' { gnupghome = gnuhome }
                 etcFile = chroot cfg </> "etc" </> "ssh" </> "ssh_config"
-                etcFileBS = B.pack etcFile
             -- dump stderr here
             withErrFile (takeDirectory (chroot cfg)) $ \myStdErr -> do
                 -- initialize config file with actual systems
@@ -278,16 +277,18 @@ doTests tkConfig = hspec $ do
                     copyFile "/etc/ssh/ssh_config" etcFile
                 -- copy ssh_config to ssh_config.old, preserving timestamps
                 (mtime0,etcFile0) <- saveFileInfo etcFile
-                let hasSubStr x file = B.isPrefixOf x . snd . B.breakSubstring x <$> B.readFile file 
+                let hasSubStr file x =
+                      doesFileExist file >>= 
+                          (bool (return False) $ B.isPrefixOf x . snd . B.breakSubstring x <$> B.readFile file)
                 -- does it already mention /var/cache/kiki/ssh_known_hosts? expect not 
-                subStr0 <- etcFileBS `hasSubStr` "/var/cache/kiki/ssh_known_hosts"
+                subStr0 <- etcFile `hasSubStr` "/var/cache/kiki/ssh_known_hosts"
                 cokiki cfg ["ssh-client"] myStdErr
                 -- get counts of lines subtracted, and lines added, expect (1,1)
                 (lost,gained) <- linesSubtractedAndAdded etcFile
                 -- did Sha1 change? expect it did
                 bChanged <- compareSha1 etcFile
                 -- does it mention /var/cache/kiki/ssh_known_hosts now? expect it does
-                subStr <- etcFileBS `hasSubStr` "/var/cache/kiki/ssh_known_hosts"
+                subStr <- etcFile `hasSubStr` "/var/cache/kiki/ssh_known_hosts"
                 -- new mtime
                 mtime <- getModificationTime etcFile
                 (lost,gained,bChanged,(subStr0,subStr),compare mtime mtime0) `shouldBe` (1,1,True,(False,True),GT)
@@ -333,14 +334,17 @@ doTests tkConfig = hspec $ do
                     (\(_,h) -> hClose h) $ \(errfile,myStdErr) ->
               flip catch (\(e::SomeException) -> (do
                                 b <- hIsOpen myStdErr
-                                x <- if b then do 
+                                x <- if b then try $ do
                                                 x' <- hGetContents myStdErr
                                                 hClose myStdErr
                                                 return x'
-                                          else readFile errfile
+                                          else try $ readFile errfile :: IO (Either SomeException String)
                                 let e' = show e
-                                if "Pending" `isPrefixOf` e' then throw e
-                                                             else return (x,show e)
+                                let showR (Right x) = show x
+                                    showR _ = ""
+                                if ("Pending" `isPrefixOf` e'
+                                   || "HUnit" `isPrefixOf` e') then throw e
+                                                               else return (showR x,show e) 
                             ) `shouldReturn` (drop len errfile,"EXCEPTION")) $ action myStdErr
 
         kiki'Env config args = do