[Python-checkins] r57536 - python/trunk/Lib/test/test_ssl.py

[neal.norwitz]

Author: neal.norwitz
Date: Mon Aug 27 02:58:33 2007
New Revision: 57536

Modified:
   python/trunk/Lib/test/test_ssl.py
Log:
Stop using string.join (from the module) to ease upgrade to py3k

Modified: python/trunk/Lib/test/test_ssl.py
==============================================================================
--- python/trunk/Lib/test/test_ssl.py	(original)
+++ python/trunk/Lib/test/test_ssl.py	Mon Aug 27 02:58:33 2007
@@ -12,7 +12,6 @@
 import pprint
 import urllib
 import shutil
-import string
 import traceback
 
 # Optionally test SSL support, if we have it in the tested platform
@@ -94,14 +93,14 @@
         try:
             s1.connect(('127.0.0.1', 10024))
         except:
-            sys.stdout.write("connection failure:\n" + string.join(
+            sys.stdout.write("connection failure:\n" + ' '.join(
                 traceback.format_exception(*sys.exc_info())))
             raise test_support.TestFailed("Can't connect to test server")
         else:
             try:
                 c1 = ssl.sslsocket(s1, ssl_version=ssl.PROTOCOL_TLSv1)
             except:
-                sys.stdout.write("SSL handshake failure:\n" + string.join(
+                sys.stdout.write("SSL handshake failure:\n" + ' '.join(
                     traceback.format_exception(*sys.exc_info())))
                 raise test_support.TestFailed("Can't SSL-handshake with test server")
             else:
@@ -120,7 +119,7 @@
         try:
             s2.connect(('127.0.0.1', 10024))
         except:
-            sys.stdout.write("connection failure:\n" + string.join(
+            sys.stdout.write("connection failure:\n" + ' '.join(
                 traceback.format_exception(*sys.exc_info())))
             raise test_support.TestFailed("Can't connect to test server")
         else:
@@ -128,7 +127,7 @@
                 c2 = ssl.sslsocket(s2, ssl_version=ssl.PROTOCOL_TLSv1,
                                    cert_reqs=ssl.CERT_REQUIRED, ca_certs=CERTFILE)
             except:
-                sys.stdout.write("SSL handshake failure:\n" + string.join(
+                sys.stdout.write("SSL handshake failure:\n" + ' '.join(
                     traceback.format_exception(*sys.exc_info())))
                 raise test_support.TestFailed("Can't SSL-handshake with test server")
             else:
@@ -174,7 +173,7 @@
             except:
                 # here, we want to stop the server, because this shouldn't
                 # happen in the context of our test case
-                sys.stdout.write("Test server failure:\n" + string.join(
+                sys.stdout.write("Test server failure:\n" + ' '.join(
                     traceback.format_exception(*sys.exc_info())))
                 self.running = False
                 # normally, we'd just stop here, but for the test
@@ -197,7 +196,7 @@
                         #sys.stdout.write("\nserver: %s\n" % msg.strip().lower())
                         sslconn.write(msg.lower())
                 except ssl.sslerror:
-                    sys.stdout.write("Test server failure:\n" + string.join(
+                    sys.stdout.write("Test server failure:\n" + ' '.join(
                         traceback.format_exception(*sys.exc_info())))
                     sslconn.close()
                     self.running = False
@@ -205,7 +204,7 @@
                     # harness, we want to stop the server
                     self.server.stop()
                 except:
-                    sys.stdout.write(string.join(
+                    sys.stdout.write(' '.join(
                         traceback.format_exception(*sys.exc_info())))
 
     def __init__(self, port, certificate, ssl_version=None,
@@ -251,7 +250,7 @@
             except KeyboardInterrupt:
                 self.stop()
             except:
-                sys.stdout.write("Test server failure:\n" + string.join(
+                sys.stdout.write("Test server failure:\n" + ' '.join(
                     traceback.format_exception(*sys.exc_info())))
 
     def stop (self):
@@ -322,7 +321,8 @@
         (conffile, crtfile, crtfile))
     # now we have a self-signed server cert in crtfile
     os.unlink(conffile)
-    if error or not os.path.exists(crtfile) or os.path.getsize(crtfile) == 0:
+    if (os.WEXITSTATUS(error) or
+        not os.path.exists(crtfile) or os.path.getsize(crtfile) == 0):
         raise test_support.TestFailed(
             "Unable to create certificate for test %d." % error)
     return d, crtfile