From 5d7edcd9d08d86e72fdc65116f3debbde6086845 Mon Sep 17 00:00:00 2001 From: James Crayne Date: Wed, 27 Apr 2016 21:32:22 -0400 Subject: transactional refreshCache function in cokiki --- testkiki/testkiki.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'testkiki') diff --git a/testkiki/testkiki.hs b/testkiki/testkiki.hs index 90b6635..c8b141b 100644 --- a/testkiki/testkiki.hs +++ b/testkiki/testkiki.hs @@ -262,7 +262,7 @@ doTests tkConfig = hspec $ do -- **** cokiki tests ***** describe "cokiki ssh-client" $ do - it "modifies system ssh configuration to respect /var/cache/kiki/ssh_known_hosts." $ + it "modifies system ssh configuration to respect /var/cache/kiki/config/ssh_known_hosts." $ onlyIf didInit3 $ do let cfg' = appendpaths tkConfig "3" home = "root" -- chroot cfg' "root" @@ -287,8 +287,8 @@ doTests tkConfig = hspec $ do nonComment x = not ("#" `B.isPrefixOf` x) lines <- filter nonComment . map dropSp . B.lines <$> B.readFile file return (any (x `B.isInfixOf`) lines) ) - -- does it already mention /var/cache/kiki/ssh_known_hosts? expect not - subStr0 <- etcFile `hasSubStr` "/var/cache/kiki/ssh_known_hosts" + -- does it already mention /var/cache/kiki/config/ssh_known_hosts? expect not + subStr0 <- etcFile `hasSubStr` "/var/cache/kiki/config/ssh_known_hosts" bReplace <- etcFile `hasUnCommentedSubStr` "GlobalKnownHostsFile" (code,(outs,ers)) <- runExternal (mkCokiki cfg ["ssh-client"]) Nothing -- outs <- cokiki cfg ["ssh-client"] myStdErr @@ -298,8 +298,8 @@ doTests tkConfig = hspec $ do (lost,gained) <- linesSubtractedAndAdded etcFile -- did Sha1 change? expect it did bChanged <- isChangedSha1 etcFile - -- does it mention /var/cache/kiki/ssh_known_hosts now? expect it does - subStr <- etcFile `hasSubStr` "/var/cache/kiki/ssh_known_hosts" + -- does it mention /var/cache/kiki/config/ssh_known_hosts now? expect it does + subStr <- etcFile `hasSubStr` "/var/cache/kiki/config/ssh_known_hosts" -- new mtime mtime <- getModificationTime etcFile if bReplace then -- cgit v1.2.3