Switch from Twisted's TestCase to the stdlib TestCase so there are fewer ways the test suite can be invoked

4 files changed, 17 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index ee9c773..cf40360 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-05  Jean-Paul Calderone  <exarkun@twistedmatrix.com>
+
+	* test/util.py, test/test_ssl.py, test/test_crypto.py: Stop trying
+	  to use Twisted's TestCase even when it's available.  Instead,
+	  always use the stdlib TestCase with a few enhancements.
+
 2009-07-04  Jean-Paul Calderone  <exarkun@twistedmatrix.com>
 
 	* Changed most extension types so that they can be instantiated
diff --git a/setup.py b/setup.py
index 50809de..645e459 100755
--- a/setup.py
+++ b/setup.py
@@ -86,6 +86,7 @@ setup(name='pyOpenSSL', version=__version__,
                      mkExtension('SSL')],
       py_modules  = ['OpenSSL.__init__', 'OpenSSL.tsafe',
                      'OpenSSL.version', 'OpenSSL.test.__init__',
+                     'OpenSSL.test.util',
                      'OpenSSL.test.test_crypto',
                      'OpenSSL.test.test_ssl'],
       data_files = data_files,
diff --git a/test/test_crypto.py b/test/test_crypto.py
index d83218b..28a2eba 100644
--- a/test/test_crypto.py
+++ b/test/test_crypto.py
@@ -4,7 +4,8 @@
 Unit tests for L{OpenSSL.crypto}.
 """
 
-from unittest import TestCase, main
+from unittest import main
+
 from os import popen2
 
 from OpenSSL.crypto import TYPE_RSA, TYPE_DSA, Error, PKey, PKeyType
@@ -18,6 +19,7 @@ from OpenSSL.crypto import dump_certificate_request, dump_privatekey
 from OpenSSL.crypto import PKCS7Type, load_pkcs7_data
 from OpenSSL.crypto import PKCS12Type, load_pkcs12
 from OpenSSL.crypto import NetscapeSPKI, NetscapeSPKIType
+from OpenSSL.test.util import TestCase
 
 
 cleartextCertificatePEM = """-----BEGIN CERTIFICATE-----
diff --git a/test/test_ssl.py b/test/test_ssl.py
index 51ff5c7..1aa2f95 100644
--- a/test/test_ssl.py
+++ b/test/test_ssl.py
@@ -9,19 +9,14 @@ from tempfile import mktemp
 from socket import socket
 from os import makedirs, symlink
 from os.path import join
-
-try:
-    # Prefer Twisted's TestCase, since it supports things like skips.
-    from twisted.trial.unittest import TestCase
-except ImportError:
-    # Fall back to the stdlib TestCase though, since it kind of works.
-    from unittest import TestCase
+from unittest import main
 
 from OpenSSL.crypto import TYPE_RSA, FILETYPE_PEM, PKey, dump_privatekey, load_certificate, load_privatekey
 from OpenSSL.SSL import WantReadError, Context, Connection, Error
 from OpenSSL.SSL import SSLv2_METHOD, SSLv3_METHOD, SSLv23_METHOD, TLSv1_METHOD
 from OpenSSL.SSL import OP_NO_SSLv2, OP_NO_SSLv3, OP_SINGLE_DH_USE 
 from OpenSSL.SSL import VERIFY_PEER, VERIFY_FAIL_IF_NO_PEER_CERT, VERIFY_CLIENT_ONCE
+from OpenSSL.test.util import TestCase
 from OpenSSL.test.test_crypto import _Python23TestCaseHelper, cleartextCertificatePEM, cleartextPrivateKeyPEM
 try:
     from OpenSSL.SSL import OP_NO_QUERY_MTU
@@ -598,3 +593,8 @@ class MemoryBIOTests(TestCase):
         # We don't want WantReadError or ZeroReturnError or anything - it's a
         # handshake failure.
         self.assertEquals(e.__class__, Error)
+
+
+
+if __name__ == '__main__':
+    main()