commit 316aa2c686bb50ad184c97ebfc0e1a1c6e70c2bf
author Alex Gaynor <alex.gaynor@gmail.com> Sat Sep 10 14:42:53 2016 -0400
committer Hynek Schlawack <hs@ox.cx> Sat Sep 10 20:42:53 2016 +0200
tree 778bcd42106e8bff21b3f00de3a027eeab537a18
parent 2310f8be403b146d0c57e5d0f551485d72d305f4

Pass an explicit nameopt to be resillient to OpenSSL default changes (#533)

* fix two tests for OpenSSL 1.1.0's new defaults

* flake8

tests/test_crypto.py

diff --git a/tests/test_crypto.py b/tests/test_crypto.py
index 7f83e67..c441e15 100644
--- a/tests/test_crypto.py
+++ b/tests/test_crypto.py
@@ -2776,7 +2776,8 @@
         dumped_pem2 = dump_certificate(FILETYPE_PEM, cert2)
         self.assertEqual(dumped_pem2, cleartextCertificatePEM)
         dumped_text = dump_certificate(FILETYPE_TEXT, cert)
-        good_text = _runopenssl(dumped_pem, b"x509", b"-noout", b"-text")
+        good_text = _runopenssl(
+            dumped_pem, b"x509", b"-noout", b"-text", b"-nameopt", b"")
         self.assertEqual(dumped_text, good_text)
 
     def test_dump_certificate_bad_type(self):
@@ -2865,7 +2866,8 @@
         dumped_pem2 = dump_certificate_request(FILETYPE_PEM, req2)
         self.assertEqual(dumped_pem2, cleartextCertificateRequestPEM)
         dumped_text = dump_certificate_request(FILETYPE_TEXT, req)
-        good_text = _runopenssl(dumped_pem, b"req", b"-noout", b"-text")
+        good_text = _runopenssl(
+            dumped_pem, b"req", b"-noout", b"-text", b"-nameopt", b"")
         self.assertEqual(dumped_text, good_text)
         self.assertRaises(ValueError, dump_certificate_request, 100, req)