From d9fc7252f9470f6f9f6c05047e2fcf1c5c34667a Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Thu, 11 Dec 2014 12:25:00 -0600 Subject: change it to not_valid_* why not --- tests/test_x509.py | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'tests/test_x509.py') diff --git a/tests/test_x509.py b/tests/test_x509.py index 73810f18..4fac1e55 100644 --- a/tests/test_x509.py +++ b/tests/test_x509.py @@ -56,12 +56,12 @@ class TestRSAX509Certificate(object): backend ) - assert cert.not_before == datetime.datetime(2010, 1, 1, 8, 30) - assert cert.not_after == datetime.datetime(2030, 12, 31, 8, 30) + assert cert.not_valid_before == datetime.datetime(2010, 1, 1, 8, 30) + assert cert.not_valid_after == datetime.datetime(2030, 12, 31, 8, 30) assert cert.serial == 2 public_key = cert.public_key() assert isinstance(public_key, interfaces.RSAPublicKey) - assert cert.version == x509.X509Version.v3 + assert cert.version is x509.X509Version.v3 fingerprint = binascii.hexlify(cert.fingerprint(hashes.SHA1())) assert fingerprint == b"6f49779533d565e8b7c1062503eab41492c38e4d" @@ -75,7 +75,7 @@ class TestRSAX509Certificate(object): backend ) - assert cert.not_before == datetime.datetime(1950, 1, 1, 12, 1) + assert cert.not_valid_before == datetime.datetime(1950, 1, 1, 12, 1) def test_pre_2000_utc_not_after_cert(self, backend): cert = _load_cert( @@ -87,7 +87,7 @@ class TestRSAX509Certificate(object): backend ) - assert cert.not_after == datetime.datetime(1999, 1, 1, 12, 1) + assert cert.not_valid_after == datetime.datetime(1999, 1, 1, 12, 1) def test_post_2000_utc_cert(self, backend): cert = _load_cert( @@ -95,8 +95,12 @@ class TestRSAX509Certificate(object): x509.load_pem_x509_certificate, backend ) - assert cert.not_before == datetime.datetime(2014, 11, 26, 21, 41, 20) - assert cert.not_after == datetime.datetime(2014, 12, 26, 21, 41, 20) + assert cert.not_valid_before == datetime.datetime( + 2014, 11, 26, 21, 41, 20 + ) + assert cert.not_valid_after == datetime.datetime( + 2014, 12, 26, 21, 41, 20 + ) def test_generalized_time_not_before_cert(self, backend): cert = _load_cert( @@ -107,9 +111,9 @@ class TestRSAX509Certificate(object): x509.load_der_x509_certificate, backend ) - assert cert.not_before == datetime.datetime(2002, 1, 1, 12, 1) - assert cert.not_after == datetime.datetime(2030, 12, 31, 8, 30) - assert cert.version == x509.X509Version.v3 + assert cert.not_valid_before == datetime.datetime(2002, 1, 1, 12, 1) + assert cert.not_valid_after == datetime.datetime(2030, 12, 31, 8, 30) + assert cert.version is x509.X509Version.v3 def test_generalized_time_not_after_cert(self, backend): cert = _load_cert( @@ -120,9 +124,9 @@ class TestRSAX509Certificate(object): x509.load_der_x509_certificate, backend ) - assert cert.not_before == datetime.datetime(2010, 1, 1, 8, 30) - assert cert.not_after == datetime.datetime(2050, 1, 1, 12, 1) - assert cert.version == x509.X509Version.v3 + assert cert.not_valid_before == datetime.datetime(2010, 1, 1, 8, 30) + assert cert.not_valid_after == datetime.datetime(2050, 1, 1, 12, 1) + assert cert.version is x509.X509Version.v3 def test_invalid_version_cert(self, backend): cert = _load_cert( @@ -139,7 +143,7 @@ class TestRSAX509Certificate(object): x509.load_pem_x509_certificate, backend ) - assert cert.version == x509.X509Version.v1 + assert cert.version is x509.X509Version.v1 def test_invalid_pem(self, backend): with pytest.raises(ValueError): -- cgit v1.2.3