From: Ben Darnell <ben@bendarnell.com>
Date: Tue, 7 Sep 2010 23:01:22 +0000 (-0700)
Subject: Disable SSL test on python 2.5
X-Git-Tag: v1.1.0~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb8d2fa458dd565b88db4e2185062f641864e990;p=thirdparty%2Ftornado.git

Disable SSL test on python 2.5
---

diff --git a/tornado/test/httpserver_test.py b/tornado/test/httpserver_test.py
index cf797093a..c3b5f4592 100644
--- a/tornado/test/httpserver_test.py
+++ b/tornado/test/httpserver_test.py
@@ -8,6 +8,11 @@ import re
 import unittest
 import urllib
 
+try:
+    import ssl
+except ImportError:
+    ssl = None
+
 class HelloWorldRequestHandler(RequestHandler):
     def get(self):
         self.finish("Hello world")
@@ -33,3 +38,7 @@ class SSLTest(AsyncHTTPTestCase, LogTrapTestCase):
                                prepare_curl_callback=disable_cert_check)
         response = self.wait()
         self.assertEqual(response.body, "Hello world")
+
+if ssl is None:
+    # Don't try to run ssl tests if we don't have the ssl module
+    del SSLTest