diff options
Diffstat (limited to 'tests/test_ssl_win.py')
| -rw-r--r-- | tests/test_ssl_win.py | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/tests/test_ssl_win.py b/tests/test_ssl_win.py index 34e9835..b2bbddb 100644 --- a/tests/test_ssl_win.py +++ b/tests/test_ssl_win.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +from __future__ import absolute_import """Unit tests for M2Crypto.SSL. @@ -7,7 +8,9 @@ on your PATH. Copyright (c) 2000-2001 Ng Pheng Siong. All rights reserved.""" -import os, os.path, string, time +import os +import os.path +import time try: import unittest2 as unittest except ImportError: @@ -19,21 +22,20 @@ except ImportError: win32process = None if win32process: - from M2Crypto import Rand, SSL - import test_ssl + from M2Crypto import Rand + from . import test_ssl def find_openssl(): plist = os.environ['PATH'].split(';') for p in plist: try: - dir = os.listdir(p) - if 'openssl.exe' in dir: + path_dir = os.listdir(p) + if 'openssl.exe' in path_dir: return os.path.join(p, 'openssl.exe') except WindowsError: pass return None - srv_host = 'localhost' srv_port = 64000 @@ -47,9 +49,10 @@ if win32process: # to find the .pem files os.chdir('tests') try: - hproc, hthread, pid, tid = win32process.CreateProcess(self.openssl, - string.join(args), None, None, 0, win32process.DETACHED_PROCESS, - None, None, self.startupinfo) + hproc, _, _, _ = win32process.CreateProcess( + self.openssl, ' '.join(args), None, None, 0, + win32process.DETACHED_PROCESS, None, None, + self.startupinfo) finally: os.chdir('..') time.sleep(0.3) @@ -58,14 +61,12 @@ if win32process: def stop_server(self, hproc): win32process.TerminateProcess(hproc, 0) - def suite(): return unittest.makeSuite(SSLWinClientTestCase) def zap_servers(): pass - if __name__ == '__main__': try: if find_openssl() is not None: |