Merge pull request #2064 from reaperhulk/simplify-x509

simplify x509 csr builder tests

1 files changed, 0 insertions, 40 deletions

diff --git a/tests/test_x509.py b/tests/test_x509.py
index 429f2d25..ee83ed2d 100644
--- a/tests/test_x509.py
+++ b/tests/test_x509.py
@@ -697,11 +697,7 @@ class TestCertificateSigningRequestBuilder(object):
 
         request = x509.CertificateSigningRequestBuilder().subject_name(
             x509.Name([
-                x509.NameAttribute(x509.OID_COUNTRY_NAME, u'US'),
-                x509.NameAttribute(x509.OID_STATE_OR_PROVINCE_NAME, u'Texas'),
-                x509.NameAttribute(x509.OID_LOCALITY_NAME, u'Austin'),
                 x509.NameAttribute(x509.OID_ORGANIZATION_NAME, u'PyCA'),
-                x509.NameAttribute(x509.OID_COMMON_NAME, u'cryptography.io'),
             ])
         ).add_extension(
             x509.BasicConstraints(ca=True, path_length=2), critical=True
@@ -715,11 +711,7 @@ class TestCertificateSigningRequestBuilder(object):
         subject = request.subject
         assert isinstance(subject, x509.Name)
         assert list(subject) == [
-            x509.NameAttribute(x509.OID_COUNTRY_NAME, u'US'),
-            x509.NameAttribute(x509.OID_STATE_OR_PROVINCE_NAME, u'Texas'),
-            x509.NameAttribute(x509.OID_LOCALITY_NAME, u'Austin'),
             x509.NameAttribute(x509.OID_ORGANIZATION_NAME, u'PyCA'),
-            x509.NameAttribute(x509.OID_COMMON_NAME, u'cryptography.io'),
         ]
         basic_constraints = request.extensions.get_extension_for_oid(
             x509.OID_BASIC_CONSTRAINTS
@@ -733,12 +725,8 @@ class TestCertificateSigningRequestBuilder(object):
 
         request = x509.CertificateSigningRequestBuilder().subject_name(
             x509.Name([
-                x509.NameAttribute(x509.OID_COUNTRY_NAME, u'US'),
-                x509.NameAttribute(x509.OID_STATE_OR_PROVINCE_NAME, u'Texas'),
-                x509.NameAttribute(x509.OID_LOCALITY_NAME, u'Austin'),
                 x509.NameAttribute(x509.OID_ORGANIZATION_NAME,
                                    u'PyCA\U0001f37a'),
-                x509.NameAttribute(x509.OID_COMMON_NAME, u'cryptography.io'),
             ])
         ).add_extension(
             x509.BasicConstraints(ca=True, path_length=2), critical=True
@@ -752,11 +740,7 @@ class TestCertificateSigningRequestBuilder(object):
         subject = loaded_request.subject
         assert isinstance(subject, x509.Name)
         assert list(subject) == [
-            x509.NameAttribute(x509.OID_COUNTRY_NAME, u'US'),
-            x509.NameAttribute(x509.OID_STATE_OR_PROVINCE_NAME, u'Texas'),
-            x509.NameAttribute(x509.OID_LOCALITY_NAME, u'Austin'),
             x509.NameAttribute(x509.OID_ORGANIZATION_NAME, u'PyCA\U0001f37a'),
-            x509.NameAttribute(x509.OID_COMMON_NAME, u'cryptography.io'),
         ]
 
     @pytest.mark.requires_backend_interface(interface=RSABackend)
@@ -766,10 +750,6 @@ class TestCertificateSigningRequestBuilder(object):
         request = x509.CertificateSigningRequestBuilder().subject_name(
             x509.Name([
                 x509.NameAttribute(x509.OID_COUNTRY_NAME, u'US'),
-                x509.NameAttribute(x509.OID_STATE_OR_PROVINCE_NAME, u'Texas'),
-                x509.NameAttribute(x509.OID_LOCALITY_NAME, u'Austin'),
-                x509.NameAttribute(x509.OID_ORGANIZATION_NAME, u'PyCA'),
-                x509.NameAttribute(x509.OID_COMMON_NAME, u'cryptography.io'),
             ])
         ).add_extension(
             x509.BasicConstraints(ca=False, path_length=None), critical=True,
@@ -784,10 +764,6 @@ class TestCertificateSigningRequestBuilder(object):
         assert isinstance(subject, x509.Name)
         assert list(subject) == [
             x509.NameAttribute(x509.OID_COUNTRY_NAME, u'US'),
-            x509.NameAttribute(x509.OID_STATE_OR_PROVINCE_NAME, u'Texas'),
-            x509.NameAttribute(x509.OID_LOCALITY_NAME, u'Austin'),
-            x509.NameAttribute(x509.OID_ORGANIZATION_NAME, u'PyCA'),
-            x509.NameAttribute(x509.OID_COMMON_NAME, u'cryptography.io'),
         ]
         basic_constraints = request.extensions.get_extension_for_oid(
             x509.OID_BASIC_CONSTRAINTS
@@ -805,11 +781,7 @@ class TestCertificateSigningRequestBuilder(object):
 
         request = x509.CertificateSigningRequestBuilder().subject_name(
             x509.Name([
-                x509.NameAttribute(x509.OID_COUNTRY_NAME, u'US'),
                 x509.NameAttribute(x509.OID_STATE_OR_PROVINCE_NAME, u'Texas'),
-                x509.NameAttribute(x509.OID_LOCALITY_NAME, u'Austin'),
-                x509.NameAttribute(x509.OID_ORGANIZATION_NAME, u'PyCA'),
-                x509.NameAttribute(x509.OID_COMMON_NAME, u'cryptography.io'),
             ])
         ).add_extension(
             x509.BasicConstraints(ca=True, path_length=2), critical=True
@@ -823,11 +795,7 @@ class TestCertificateSigningRequestBuilder(object):
         subject = request.subject
         assert isinstance(subject, x509.Name)
         assert list(subject) == [
-            x509.NameAttribute(x509.OID_COUNTRY_NAME, u'US'),
             x509.NameAttribute(x509.OID_STATE_OR_PROVINCE_NAME, u'Texas'),
-            x509.NameAttribute(x509.OID_LOCALITY_NAME, u'Austin'),
-            x509.NameAttribute(x509.OID_ORGANIZATION_NAME, u'PyCA'),
-            x509.NameAttribute(x509.OID_COMMON_NAME, u'cryptography.io'),
         ]
         basic_constraints = request.extensions.get_extension_for_oid(
             x509.OID_BASIC_CONSTRAINTS
@@ -845,10 +813,6 @@ class TestCertificateSigningRequestBuilder(object):
         request = x509.CertificateSigningRequestBuilder().subject_name(
             x509.Name([
                 x509.NameAttribute(x509.OID_COUNTRY_NAME, u'US'),
-                x509.NameAttribute(x509.OID_STATE_OR_PROVINCE_NAME, u'Texas'),
-                x509.NameAttribute(x509.OID_LOCALITY_NAME, u'Austin'),
-                x509.NameAttribute(x509.OID_ORGANIZATION_NAME, u'PyCA'),
-                x509.NameAttribute(x509.OID_COMMON_NAME, u'cryptography.io'),
             ])
         ).add_extension(
             x509.BasicConstraints(ca=True, path_length=2), critical=True
@@ -863,10 +827,6 @@ class TestCertificateSigningRequestBuilder(object):
         assert isinstance(subject, x509.Name)
         assert list(subject) == [
             x509.NameAttribute(x509.OID_COUNTRY_NAME, u'US'),
-            x509.NameAttribute(x509.OID_STATE_OR_PROVINCE_NAME, u'Texas'),
-            x509.NameAttribute(x509.OID_LOCALITY_NAME, u'Austin'),
-            x509.NameAttribute(x509.OID_ORGANIZATION_NAME, u'PyCA'),
-            x509.NameAttribute(x509.OID_COMMON_NAME, u'cryptography.io'),
         ]
         basic_constraints = request.extensions.get_extension_for_oid(
             x509.OID_BASIC_CONSTRAINTS