From f00baeefa46a0507f88beee5535dfbb036097ece Mon Sep 17 00:00:00 2001
From: James Crayne <jim.crayne@gmail.com>
Date: Mon, 25 Apr 2016 22:40:30 -0400
Subject: run kiki init tests before export-public

---
 testkiki/testkiki.hs | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

(limited to 'testkiki')

diff --git a/testkiki/testkiki.hs b/testkiki/testkiki.hs
index 3ba7155..839cebf 100644
--- a/testkiki/testkiki.hs
+++ b/testkiki/testkiki.hs
@@ -63,22 +63,7 @@ doTests tkConfig = hspec $ do
             evaluate (error "TODO:testsuite") `shouldThrow` anyException
      -}
 
-    describe "kiki export-public" $ do
-        it "does not modify mtime of GNUPGHOME keyrings" $ do
-            pending
-        it "creates external pem files which do not exist" $ do
-            pending
-        it "does not leak secret data from GNUPGHOME keyrings" $ do
-            pending
-
-    describe "kiki export-secret" $ do 
-        it "fails when public keys in existing PEM files do not match" $ do 
-            pending
-        it "updates public pem files to private ones when told to" $ do
-            pending
-        it "creates external pem files which do not exist" $ do
-            pending
-
+    -- **** kiki tests *****
     describe "kiki init" $ do 
         it "honors GNUPGHOME environment variable" $ do
             let kiki = kiki'Env tkConfig
@@ -105,6 +90,23 @@ doTests tkConfig = hspec $ do
             b <- doesFileExist (chroot tkConfig </> "root" </> ".gnupg" </> "secring.gpg")
             (isInfixOf "New packet" output && b ) `shouldBe` True
 
+    describe "kiki export-public" $ do
+        it "does not modify mtime of GNUPGHOME keyrings" $ do
+            pending
+        it "creates external pem files which do not exist" $ do
+            pending
+        it "does not leak secret data from GNUPGHOME keyrings" $ do
+            pending
+
+    describe "kiki export-secret" $ do
+        it "fails when public keys in existing PEM files do not match" $ do
+            pending
+        it "updates public pem files to private ones when told to" $ do
+            pending
+        it "creates external pem files which do not exist" $ do
+            pending
+
+    -- **** cokiki tests *****
     describe "cokiki ssh-client" $ do
         it "modifies system ssh configuration to respect /var/cache/kiki/ssh_known_hosts" $ do
             pending
-- 
cgit v1.2.3