diff options
| author | Matěj Cepl <mcepl@cepl.eu> | 2020-11-20 20:25:40 +0100 |
|---|---|---|
| committer | Matěj Cepl <mcepl@cepl.eu> | 2020-11-20 21:05:21 +0100 |
| commit | 0ac96ae996d36ff452afe0fbb7a368fcd35b219b (patch) | |
| tree | 015d6990df7a853255344b7d6c95a60d948d169a /tests | |
| parent | 20cdafd017916c87acea1404254226b39ceea832 (diff) | |
| download | m2crypto-0ac96ae996d36ff452afe0fbb7a368fcd35b219b.tar.gz | |
Remove support for CentOS 6 and Python 2.6
Support of CentOS 6 ends on 2020-11-30.
Fixes #283
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/__init__.py | 4 | ||||
| -rw-r--r-- | tests/test_ssl.py | 9 |
2 files changed, 3 insertions, 10 deletions
diff --git a/tests/__init__.py b/tests/__init__.py index 688264f..14ea8a2 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -2,10 +2,6 @@ import logging import os.path import sys -if sys.version_info[:2] <= (2, 6): - sys.path.insert(0, os.path.join(os.path.abspath(os.path.dirname(__file__)), - 'vendor')) - try: import unittest2 as unittest except ImportError: diff --git a/tests/test_ssl.py b/tests/test_ssl.py index 925d365..3aa781f 100644 --- a/tests/test_ssl.py +++ b/tests/test_ssl.py @@ -32,7 +32,7 @@ import time import warnings from M2Crypto import (Err, Rand, SSL, X509, ftpslib, httpslib, m2, m2urllib, - m2urllib2, m2xmlrpclib, py27plus, six) + m2urllib2, m2xmlrpclib, six) from M2Crypto.SSL.timeout import DEFAULT_TIMEOUT from tests import unittest from tests.fips import fips_mode @@ -1047,8 +1047,6 @@ class Urllib2TEChunkedSSLClientTestCase(BaseSSLClientTestCase): self.stop_server(pid) -@unittest.skipUnless(py27plus, - "Twisted doesn't test well with Python 2.6") class TwistedSSLClientTestCase(BaseSSLClientTestCase): def test_timeout(self): @@ -1223,9 +1221,8 @@ def suite(): suite.addTest(unittest.makeSuite(MiscSSLClientTestCase)) suite.addTest(unittest.makeSuite(FtpslibTestCase)) try: - if py27plus: - import M2Crypto.SSL.TwistedProtocolWrapper as wrapper # noqa - suite.addTest(unittest.makeSuite(TwistedSSLClientTestCase)) + import M2Crypto.SSL.TwistedProtocolWrapper as wrapper # noqa + suite.addTest(unittest.makeSuite(TwistedSSLClientTestCase)) except ImportError: pass return suite |