From bed25c9710dde225725dbb17e2c4b8c966a60137 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sat, 25 Jul 2015 12:58:07 +0200 Subject: [PATCH] fic race condition in tests --- OpenSSL/test/test_crypto.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/OpenSSL/test/test_crypto.py b/OpenSSL/test/test_crypto.py index b81745138..5acd2b9a3 100644 --- a/OpenSSL/test/test_crypto.py +++ b/OpenSSL/test/test_crypto.py @@ -1507,9 +1507,11 @@ def test_gmtime_adj_notBefore(self): the current time plus the number of seconds passed in. """ cert = load_certificate(FILETYPE_PEM, self.pemData) - now = datetime.utcnow() + timedelta(seconds=100) + not_before_min = datetime.utcnow().replace(microsecond=0) + timedelta(seconds=100) cert.gmtime_adj_notBefore(100) - self.assertEqual(cert.get_notBefore(), b(now.strftime("%Y%m%d%H%M%SZ"))) + not_before = datetime.strptime(cert.get_notBefore().decode(), "%Y%m%d%H%M%SZ") + not_before_max = datetime.utcnow() + timedelta(seconds=100) + self.assertTrue(not_before_min <= not_before <= not_before_max) def test_gmtime_adj_notAfter_wrong_args(self): @@ -1529,9 +1531,11 @@ def test_gmtime_adj_notAfter(self): the current time plus the number of seconds passed in. """ cert = load_certificate(FILETYPE_PEM, self.pemData) - now = datetime.utcnow() + timedelta(seconds=100) + not_after_min = datetime.utcnow().replace(microsecond=0) + timedelta(seconds=100) cert.gmtime_adj_notAfter(100) - self.assertEqual(cert.get_notAfter(), b(now.strftime("%Y%m%d%H%M%SZ"))) + not_after = datetime.strptime(cert.get_notAfter().decode(), "%Y%m%d%H%M%SZ") + not_after_max = datetime.utcnow() + timedelta(seconds=100) + self.assertTrue(not_after_min <= not_after <= not_after_max) def test_has_expired_wrong_args(self):