diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-02-02 17:05:24 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-02-02 17:05:24 -0600 |
| commit | 806bfb24feb254287c588da4887b45025bec3623 (patch) | |
| tree | 0d63918550a2fb0d701c0408eba624ef76529851 /tests | |
| parent | 5b0a8d63ab9215d9d5877df1d1c99a32d98bf8e2 (diff) | |
| download | cryptography-806bfb24feb254287c588da4887b45025bec3623.tar.gz cryptography-806bfb24feb254287c588da4887b45025bec3623.tar.bz2 cryptography-806bfb24feb254287c588da4887b45025bec3623.zip | |
rename Attribute to NameAttribute and remove name from OID
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_x509.py | 51 |
1 files changed, 23 insertions, 28 deletions
diff --git a/tests/test_x509.py b/tests/test_x509.py index f8066699..cf583247 100644 --- a/tests/test_x509.py +++ b/tests/test_x509.py @@ -250,48 +250,43 @@ class TestECDSACertificate(object): cert.public_key() -class TestAttribute(object): +class TestNameAttribute(object): def test_eq(self): - assert x509.Attribute( - x509.ObjectIdentifier('oid', 'name'), 'value' - ) == x509.Attribute( - x509.ObjectIdentifier('oid', 'name'), 'value' + assert x509.NameAttribute( + x509.ObjectIdentifier('oid'), 'value' + ) == x509.NameAttribute( + x509.ObjectIdentifier('oid'), 'value' ) def test_ne(self): - assert x509.Attribute( - x509.ObjectIdentifier('oid', 'name'), 'value' - ) != x509.Attribute( - x509.ObjectIdentifier('oid2', 'name'), 'value' + assert x509.NameAttribute( + x509.ObjectIdentifier('2.5.4.3'), 'value' + ) != x509.NameAttribute( + x509.ObjectIdentifier('2.5.4.5'), 'value' ) - assert x509.Attribute( - x509.ObjectIdentifier('oid', 'name'), 'value' - ) != x509.Attribute( - x509.ObjectIdentifier('oid', 'name2'), 'value' + assert x509.NameAttribute( + x509.ObjectIdentifier('oid'), 'value' + ) != x509.NameAttribute( + x509.ObjectIdentifier('oid'), 'value2' ) - assert x509.Attribute( - x509.ObjectIdentifier('oid', 'name'), 'value' - ) != x509.Attribute( - x509.ObjectIdentifier('oid', 'name'), 'value2' - ) - assert x509.Attribute( - x509.ObjectIdentifier('oid', 'name'), 'value' + assert x509.NameAttribute( + x509.ObjectIdentifier('oid'), 'value' ) != object() class TestObjectIdentifier(object): def test_eq(self): - oid1 = x509.ObjectIdentifier('oid', 'name') - oid2 = x509.ObjectIdentifier('oid', 'name') + oid1 = x509.ObjectIdentifier('oid') + oid2 = x509.ObjectIdentifier('oid') assert oid1 == oid2 def test_ne(self): - oid1 = x509.ObjectIdentifier('oid', 'name') - assert oid1 != x509.ObjectIdentifier('oid1', 'name') - assert oid1 != x509.ObjectIdentifier('oid', 'name1') - assert oid1 != x509.ObjectIdentifier('oid1', 'name1') + oid1 = x509.ObjectIdentifier('oid') + assert oid1 != x509.ObjectIdentifier('oid1') assert oid1 != object() def test_repr(self): - oid = x509.ObjectIdentifier("oid1", "name") - assert repr(oid) == "<ObjectIdentifier(oid=oid1, name=name)>" + oid = x509.ObjectIdentifier("2.5.4.3") + assert repr(oid) == "<ObjectIdentifier(oid=2.5.4.3, name=commonName)>" + oid = x509.ObjectIdentifier("oid1") + assert repr(oid) == "<ObjectIdentifier(oid=oid1, name=Unknown OID)>" |