diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-02-13 18:47:30 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-02-13 18:47:30 -0600 |
| commit | 53d8d49454d7cef5cd41fc854116090ca78026ce (patch) | |
| tree | 44378de0bb36ce16c208856504a897064102b1c5 /tests | |
| parent | e901d642548dd268dcdc2efa60087a3fa1774fa6 (diff) | |
| download | cryptography-53d8d49454d7cef5cd41fc854116090ca78026ce.tar.gz cryptography-53d8d49454d7cef5cd41fc854116090ca78026ce.tar.bz2 cryptography-53d8d49454d7cef5cd41fc854116090ca78026ce.zip | |
make x509.Name iterable and address other review feedback
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_x509.py | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/tests/test_x509.py b/tests/test_x509.py index c5a9e50a..0e95b258 100644 --- a/tests/test_x509.py +++ b/tests/test_x509.py @@ -10,6 +10,8 @@ import os import pytest +import six + from cryptography import x509 from cryptography.hazmat.backends.interfaces import ( DSABackend, EllipticCurveBackend, RSABackend, X509Backend @@ -66,7 +68,10 @@ class TestRSACertificate(object): ) issuer = cert.issuer assert isinstance(issuer, x509.Name) - assert issuer.attributes == [ + attributes = [] + for attrs in issuer: + attributes.append(attrs) + assert attributes == [ x509.NameAttribute(x509.OID_COUNTRY_NAME, 'US'), x509.NameAttribute( x509.OID_ORGANIZATION_NAME, 'Test Certificates 2011' @@ -89,7 +94,10 @@ class TestRSACertificate(object): issuer = cert.issuer assert isinstance(issuer, x509.Name) - assert issuer.attributes == [ + attributes = [] + for attrs in issuer: + attributes.append(attrs) + assert attributes == [ x509.NameAttribute(x509.OID_COUNTRY_NAME, 'US'), x509.NameAttribute(x509.OID_COUNTRY_NAME, 'CA'), x509.NameAttribute(x509.OID_STATE_OR_PROVINCE_NAME, 'Texas'), @@ -133,7 +141,10 @@ class TestRSACertificate(object): ) subject = cert.subject assert isinstance(subject, x509.Name) - assert subject.attributes == [ + attributes = [] + for attrs in subject: + attributes.append(attrs) + assert attributes == [ x509.NameAttribute(x509.OID_COUNTRY_NAME, 'US'), x509.NameAttribute( x509.OID_ORGANIZATION_NAME, 'Test Certificates 2011' @@ -162,13 +173,13 @@ class TestRSACertificate(object): assert cert.subject.get_attributes_for_oid(x509.OID_COMMON_NAME) == [ x509.NameAttribute( x509.OID_COMMON_NAME, - b'We heart UTF8!\xe2\x84\xa2'.decode('utf8') + six.u('We heart UTF8!\u2122') ) ] assert cert.issuer.get_attributes_for_oid(x509.OID_COMMON_NAME) == [ x509.NameAttribute( x509.OID_COMMON_NAME, - b'We heart UTF8!\xe2\x84\xa2'.decode('utf8') + six.u('We heart UTF8!\u2122') ) ] @@ -183,7 +194,10 @@ class TestRSACertificate(object): ) subject = cert.subject assert isinstance(subject, x509.Name) - assert subject.attributes == [ + attributes = [] + for attrs in subject: + attributes.append(attrs) + assert attributes == [ x509.NameAttribute(x509.OID_COUNTRY_NAME, 'AU'), x509.NameAttribute(x509.OID_COUNTRY_NAME, 'DE'), x509.NameAttribute(x509.OID_STATE_OR_PROVINCE_NAME, 'California'), |