From 2024c7dcde52010646b46e9270de3863ce0b1eaa Mon Sep 17 00:00:00 2001
From: Cedric Staub <cs@squareup.com>
Date: Fri, 10 Mar 2017 17:06:52 -0800
Subject: [PATCH] Fix output tests based on display changes

---
 tests/dump-cert-chain-to-text.t  | 14 ++++----------
 tests/dump-leaf-to-not-verbose.t |  7 +++----
 tests/dump-leaf-to-text.t        |  3 +--
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/tests/dump-cert-chain-to-text.t b/tests/dump-cert-chain-to-text.t
index 251677f..e6bc497 100644
--- a/tests/dump-cert-chain-to-text.t
+++ b/tests/dump-cert-chain-to-text.t
@@ -138,16 +138,10 @@ Dump a live cert chain (squareup-chain.crt)
   \tServer Auth (esc)
   \tClient Auth (esc)
   Alternate DNS Names:
-  \twww.squareup.com (esc)
-  \tsquareup.com (esc)
-  \taccount.squareup.com (esc)
-  \tmkt.com (esc)
-  \twww.mkt.com (esc)
-  \tmarket.squareup.com (esc)
-  \tgosq.com (esc)
-  \twww.gosq.com (esc)
-  \tgosq.co (esc)
-  \twww.gosq.co (esc)
+  \twww.squareup.com, squareup.com, (esc)
+  \taccount.squareup.com, mkt.com, www.mkt.com, (esc)
+  \tmarket.squareup.com, gosq.com, www.gosq.com, (esc)
+  \tgosq.co, www.gosq.co (esc)
   
   ** CERTIFICATE 2 **
   Serial: 30215777750102225331854468774
diff --git a/tests/dump-leaf-to-not-verbose.t b/tests/dump-leaf-to-not-verbose.t
index 71fabc1..a738753 100644
--- a/tests/dump-leaf-to-not-verbose.t
+++ b/tests/dump-leaf-to-not-verbose.t
@@ -29,11 +29,10 @@ Dump an example certificate (example-leaf.crt)
   $ certigo dump example-leaf.crt
   ** CERTIFICATE 1 **
   Valid: 2016-06-10 22:14 UTC to 2023-04-15 22:14 UTC
-  Subject: C=US, ST=CA, O=certigo, OU=example, CN=example-leaf
-  Issuer: C=US, ST=CA, O=certigo, OU=example, CN=example-leaf
+  Subject: CN=example-leaf
+  Issuer: CN=example-leaf
   Alternate DNS Names:
   \tlocalhost (esc)
   Alternate IP Addresses:
-  \t127.0.0.1 (esc)
-  \t::1 (esc)
+  \t127.0.0.1, ::1 (esc)
   
diff --git a/tests/dump-leaf-to-text.t b/tests/dump-leaf-to-text.t
index 3f4edd7..071a7a0 100644
--- a/tests/dump-leaf-to-text.t
+++ b/tests/dump-leaf-to-text.t
@@ -49,6 +49,5 @@ Dump an example certificate (example-leaf.crt)
   Alternate DNS Names:
   \tlocalhost (esc)
   Alternate IP Addresses:
-  \t127.0.0.1 (esc)
-  \t::1 (esc)
+  \t127.0.0.1, ::1 (esc)