From c12d7345ae814b74773524da520e02f492efb533 Mon Sep 17 00:00:00 2001
From: TLINDEN <git@daemon.de>
Date: Sat, 9 Nov 2013 15:35:43 +0100
Subject: [PATCH] added unittest for yaml export

---
 src/keyprint.c      | 53 +++++++++++++++++++++------------------------
 tests/unittests.cfg |  6 +++++
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/keyprint.c b/src/keyprint.c
index bf22177..08e1430 100644
--- a/src/keyprint.c
+++ b/src/keyprint.c
@@ -313,43 +313,40 @@ void pcpexport_yaml(char *outfile) {
     fprintf(out, "secret-keys:\n");
 
     for(s=pcpkey_hash; s != NULL; s=(pcp_key_t*)(s->hh.next)) {
-      fprintf(out, "-\n");
-      fprintf(out, "         id: %s\n", s->id);
-      fprintf(out, "      owner: %s\n", s->owner);
-      fprintf(out, "       mail: %s\n", s->mail);
-      fprintf(out, "      ctime: %ld\n", s->ctime);
-      fprintf(out, "    version: %08x\n", s->version);
-      fprintf(out, "     serial: %08x\n", s->serial);
-      fprintf(out, "       type: %s\n",
+      fprintf(out, " -\n");
+      fprintf(out, "  id:         %s\n", s->id);
+      fprintf(out, "  owner:      %s\n", s->owner);
+      fprintf(out, "  mail:       %s\n", s->mail);
+      fprintf(out, "  ctime:      %ld\n", s->ctime);
+      fprintf(out, "  version:    %08x\n", s->version);
+      fprintf(out, "  serial:     %08x\n", s->serial);
+      fprintf(out, "  type:       %s\n",
 	      (s->type ==  PCP_KEY_TYPE_MAINSECRET) ? "primary" : " secret");
-      fprintf(out, "     public: "); pcpprint_bin(out, s->public, 32); fprintf(out, "\n");
+      fprintf(out, "  public:     "); pcpprint_bin(out, s->public, 32); fprintf(out, "\n");
       if(s->secret[0] == 0) {
-	fprintf(out, "  encrypted: yes\n");
-	fprintf(out, "      nonce: "); pcpprint_bin(out, s->nonce, 24); fprintf(out, "\n");
-	fprintf(out, "     secret: "); pcpprint_bin(out, s->encrypted, 48); fprintf(out, "\n");
+	fprintf(out, "  encrypted:  yes\n");
+	fprintf(out, "  nonce:      "); pcpprint_bin(out, s->nonce, 24); fprintf(out, "\n");
+	fprintf(out, "  secret:     "); pcpprint_bin(out, s->encrypted, 48); fprintf(out, "\n");
       }
       else {
-	fprintf(out, "  encrypted: no\n");
-	fprintf(out, "     secret: "); pcpprint_bin(out, s->secret, 32); fprintf(out, "\n");
+	fprintf(out, "  encrypted:  no\n");
+	fprintf(out, "  secret:     "); pcpprint_bin(out, s->secret, 32); fprintf(out, "\n");
       }
-      fprintf(out, "      edpub: "); pcpprint_bin(out, s->edpub, 32); fprintf(out, "\n");
-  
-      fprintf(out, "\n");
+      fprintf(out, "  edpub:      "); pcpprint_bin(out, s->edpub, 32); fprintf(out, "\n");
     }
     
     fprintf(out, "public-keys:\n");
     for(p=pcppubkey_hash; p != NULL; p=(pcp_pubkey_t*)(p->hh.next)) {
-      fprintf(out, "-\n");
-      fprintf(out, "         id: %s\n", p->id);
-      fprintf(out, "      owner: %s\n", p->owner);
-      fprintf(out, "       mail: %s\n", p->mail);
-      fprintf(out, "      ctime: %ld\n", p->ctime);
-      fprintf(out, "    version: %08x\n", p->version);
-      fprintf(out, "     serial: %08x\n", p->serial);
-      fprintf(out, "       type: public\n");
-      fprintf(out, "     public: "); pcpprint_bin(out, p->public, 32); fprintf(out, "\n");
-      fprintf(out, "      edpub: "); pcpprint_bin(out, p->edpub, 32); fprintf(out, "\n");
-      fprintf(out, "\n");
+      fprintf(out, " -\n");
+      fprintf(out, "  id:      %s\n", p->id);
+      fprintf(out, "  owner:   %s\n", p->owner);
+      fprintf(out, "  mail:    %s\n", p->mail);
+      fprintf(out, "  ctime:   %ld\n", p->ctime);
+      fprintf(out, "  version: %08x\n", p->version);
+      fprintf(out, "  serial:  %08x\n", p->serial);
+      fprintf(out, "  type:    public\n");
+      fprintf(out, "  public:  "); pcpprint_bin(out, p->public, 32); fprintf(out, "\n");
+      fprintf(out, "  edpub:   "); pcpprint_bin(out, p->edpub, 32); fprintf(out, "\n");
     }
   }
 }
diff --git a/tests/unittests.cfg b/tests/unittests.cfg
index 556b637..074bb6c 100644
--- a/tests/unittests.cfg
+++ b/tests/unittests.cfg
@@ -204,6 +204,12 @@ dxmorg@florida.cops.gov
   expect = /verified/
 </test>
 
+#
+# yaml export test
+<test check-export-yaml>
+  cmd = $pcp -V va -y | perl -MYAML -MData::Dumper -e "print Dumper(Load(join('',<>)))"
+  expect = /VAR1/
+</test>
 
 #
 # negative tests, check for error handling