From 749da3b67c76ca7172eef88b2624b46cb99510a9 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Sun, 10 May 2015 09:58:29 -0500
Subject: repr tests are the worst. frozenset has diff repr on py3

---
 tests/test_x509_ext.py | 46 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 14 deletions(-)

(limited to 'tests/test_x509_ext.py')

diff --git a/tests/test_x509_ext.py b/tests/test_x509_ext.py
index 58fb3c46..06a68600 100644
--- a/tests/test_x509_ext.py
+++ b/tests/test_x509_ext.py
@@ -1453,14 +1453,24 @@ class TestDistributionPoint(object):
                 )
             ],
         )
-        assert repr(dp) == (
-            "<DistributionPoint(full_name=None, relative_name=<Name([<NameAtt"
-            "ribute(oid=<ObjectIdentifier(oid=2.5.4.3, name=commonName)>, val"
-            "ue='myCN')>])>, reasons=frozenset([<ReasonFlags.ca_compromise: '"
-            "cACompromise'>]), crl_issuer=[<DirectoryName(value=<Name([<NameA"
-            "ttribute(oid=<ObjectIdentifier(oid=2.5.4.3, name=commonName)>, v"
-            "alue='Important CA')>])>)>])>"
-        )
+        if six.PY3:
+            assert repr(dp) == (
+                "<DistributionPoint(full_name=None, relative_name=<Name([<Name"
+                "Attribute(oid=<ObjectIdentifier(oid=2.5.4.3, name=commonName)"
+                ">, value='myCN')>])>, reasons=frozenset({<ReasonFlags.ca_comp"
+                "romise: 'cACompromise'>}), crl_issuer=[<DirectoryName(value=<"
+                "Name([<NameAttribute(oid=<ObjectIdentifier(oid=2.5.4.3, name="
+                "commonName)>, value='Important CA')>])>)>])>"
+            )
+        else:
+            assert repr(dp) == (
+                "<DistributionPoint(full_name=None, relative_name=<Name([<Name"
+                "Attribute(oid=<ObjectIdentifier(oid=2.5.4.3, name=commonName)"
+                ">, value='myCN')>])>, reasons=frozenset([<ReasonFlags.ca_comp"
+                "romise: 'cACompromise'>]), crl_issuer=[<DirectoryName(value=<"
+                "Name([<NameAttribute(oid=<ObjectIdentifier(oid=2.5.4.3, name="
+                "commonName)>, value='Important CA')>])>)>])>"
+            )
 
 
 class TestCRLDistributionPoints(object):
@@ -1514,12 +1524,20 @@ class TestCRLDistributionPoints(object):
                 None
             ),
         ])
-        assert repr(cdp) == (
-            "<CRLDistributionPoints([<DistributionPoint(full_name=[<UniformRes"
-            "ourceIdentifier(value=ftp://domain)>], relative_name=None, reason"
-            "s=frozenset([<ReasonFlags.key_compromise: 'keyCompromise'>]), crl"
-            "_issuer=None)>])>"
-        )
+        if six.PY3:
+            assert repr(cdp) == (
+                "<CRLDistributionPoints([<DistributionPoint(full_name=[<Unifo"
+                "rmResourceIdentifier(value=ftp://domain)>], relative_name=No"
+                "ne, reasons=frozenset({<ReasonFlags.key_compromise: 'keyComp"
+                "romise'>}), crl_issuer=None)>])>"
+            )
+        else:
+            assert repr(cdp) == (
+                "<CRLDistributionPoints([<DistributionPoint(full_name=[<Unifo"
+                "rmResourceIdentifier(value=ftp://domain)>], relative_name=No"
+                "ne, reasons=frozenset([<ReasonFlags.key_compromise: 'keyComp"
+                "romise'>]), crl_issuer=None)>])>"
+            )
 
     def test_eq(self):
         cdp = x509.CRLDistributionPoints([
-- 
cgit v1.2.3