commit e82e325b328d922b7872ed01b98b5401067178b5
author Jean-Paul Calderone <exarkun@twistedmatrix.com> Sun Mar 03 10:14:10 2013 -0800
committer Jean-Paul Calderone <exarkun@twistedmatrix.com> Sun Mar 03 10:14:10 2013 -0800
tree 47c36ecb794752bbf7ed051fce412bfbeb6a1a26
parent 9a194ebe3b1a2d2e1498663ea0731dffb13ecf1a

Split dump_privatekey into several different test methods.  Also add a missing test for trying to load invalid data as PKCS7.  And fix a file descriptor leak in _runopenssl helper.

OpenSSL/test/test_crypto.py

diff --git a/OpenSSL/test/test_crypto.py b/OpenSSL/test/test_crypto.py
index a75fcff..d461d8b 100644
--- a/OpenSSL/test/test_crypto.py
+++ b/OpenSSL/test/test_crypto.py
@@ -1958,7 +1958,10 @@
     proc = Popen(command, shell=True, stdin=PIPE, stdout=PIPE)
     proc.stdin.write(pem)
     proc.stdin.close()
-    return proc.stdout.read()
+    output = proc.stdout.read()
+    proc.stdout.close()
+    proc.wait()
+    return output
 
 
 
@@ -2181,14 +2184,23 @@
         self.assertEqual(dumped_text, good_text)
 
 
-    def test_dump_privatekey(self):
+    def test_dump_privatekey_pem(self):
         """
-        :py:obj:`dump_privatekey` writes a PEM, DER, and text.
+        :py:obj:`dump_privatekey` writes a PEM
         """
         key = load_privatekey(FILETYPE_PEM, cleartextPrivateKeyPEM)
         self.assertTrue(key.check())
         dumped_pem = dump_privatekey(FILETYPE_PEM, key)
         self.assertEqual(dumped_pem, cleartextPrivateKeyPEM)
+
+
+    def test_dump_privatekey_asn1(self):
+        """
+        :py:obj:`dump_privatekey` writes a DER
+        """
+        key = load_privatekey(FILETYPE_PEM, cleartextPrivateKeyPEM)
+        dumped_pem = dump_privatekey(FILETYPE_PEM, key)
+
         dumped_der = dump_privatekey(FILETYPE_ASN1, key)
         # XXX This OpenSSL call writes "writing RSA key" to standard out.  Sad.
         good_der = _runopenssl(dumped_pem, "rsa", "-outform", "DER")
@@ -2196,6 +2208,15 @@
         key2 = load_privatekey(FILETYPE_ASN1, dumped_der)
         dumped_pem2 = dump_privatekey(FILETYPE_PEM, key2)
         self.assertEqual(dumped_pem2, cleartextPrivateKeyPEM)
+
+
+    def test_dump_privatekey_text(self):
+        """
+        :py:obj:`dump_privatekey` writes a text
+        """
+        key = load_privatekey(FILETYPE_PEM, cleartextPrivateKeyPEM)
+        dumped_pem = dump_privatekey(FILETYPE_PEM, key)
+
         dumped_text = dump_privatekey(FILETYPE_TEXT, key)
         good_text = _runopenssl(dumped_pem, "rsa", "-noout", "-text")
         self.assertEqual(dumped_text, good_text)
@@ -2275,6 +2296,14 @@
         self.assertTrue(isinstance(pkcs7, PKCS7Type))
 
 
+    def test_load_pkcs7_data_invalid(self):
+        """
+        If the data passed to :py:obj:`load_pkcs7_data` is invalid,
+        :py:obj:`Error` is raised.
+        """
+        self.assertRaises(Error, load_pkcs7_data, FILETYPE_PEM, "foo")
+
+
 
 class PKCS7Tests(TestCase):
     """