Fix test_rfc2986 issues

Author: etingof

CHANGES.txt

@@ -1,5 +1,5 @@
 
-Revision 0.2.6, released XX-05-2019
+Revision 0.2.6, released XX-07-2019
 -----------------------------------
 
 - Added RFC3560 providing RSAES-OAEP Key Transport Algorithm

tests/test_rfc2986.py

@@ -10,6 +10,7 @@
 from pyasn1.codec.der import encoder as der_encoder
 
 from pyasn1.type import char
+from pyasn1.type import univ
 
 from pyasn1_modules import pem
 from pyasn1_modules import rfc2986
@@ -56,10 +57,16 @@ def testDerCodec(self):
 
     def testOpenTypes(self):
 
+        id_at_commonName = (2, 5, 4, 3)
+        id_at_countryName = (2, 5, 4, 6)
+
         substrate = pem.readBase64fromText(self.pem_text)
 
         rfc2986.certificateAttributesMap.update(
-            rfc5280.certificateAttributesMap)
+            {
+                id_at_countryName: char.PrintableString()
+            }
+        )
 
         asn1Object, rest = der_decoder.decode(substrate,
             asn1Spec=rfc2986.CertificationRequest(),
@@ -70,10 +77,11 @@ def testOpenTypes(self):
         assert der_encoder.encode(asn1Object) == substrate
 
         for rdn in asn1Object['certificationRequestInfo']['subject']['rdnSequence']:
-            if rdn[0]['type'] == rfc2986.id_at_countryName:
+            if rdn[0]['type'] == id_at_countryName:
                 assert rdn[0]['value'] == char.PrintableString('US')
-            else:
-                assert len(rdn[0]['value']['utf8String']) > 2
+            elif rdn[0]['type'] == id_at_commonName:
+                assert rdn[0]['value'] == univ.OctetString(
+                    hexValue='0c146663752e66616b652e616464726573732e6f7267')
 
 
 suite = unittest.TestLoader().loadTestsFromModule(sys.modules[__name__])