Merge pull request #38 from treemo/master

test web server: fix test broken

tests/web/test_servers.py

@@ -4,6 +4,7 @@
 
 from os import path
 from socket import gaierror
+import ssl
 
 from circuits.web import Controller
 from circuits import handler, Component
@@ -12,6 +13,7 @@
 from .helpers import urlopen, URLError
 
 CERTFILE = path.join(path.dirname(__file__), "cert.pem")
+SSL_CONTEXT = ssl._create_unverified_context()  # self signed cert
 
 
 class BaseRoot(Component):
@@ -46,10 +48,10 @@ def test_baseserver(manager, watcher):
     try:
         f = urlopen(server.http.base)
     except URLError as e:
-        if type(e[0]) is gaierror:
+        if isinstance(e.reason, gaierror):
             f = urlopen("http://127.0.0.1:9000")
         else:
-            raise
+            raise e
 
     s = f.read()
     assert s == b"Hello World!"
@@ -68,10 +70,10 @@ def test_server(manager, watcher):
     try:
         f = urlopen(server.http.base)
     except URLError as e:
-        if type(e[0]) is gaierror:
+        if isinstance(e.reason, gaierror):
             f = urlopen("http://127.0.0.1:9000")
         else:
-            raise
+            raise e
 
     s = f.read()
     assert s == b"Hello World!"
@@ -90,12 +92,12 @@ def test_secure_server(manager, watcher):
     Root().register(server)
 
     try:
-        f = urlopen(server.http.base)
+        f = urlopen(server.http.base, context=SSL_CONTEXT)
     except URLError as e:
-        if type(e[0]) is gaierror:
+        if isinstance(e.reason, gaierror):
             f = urlopen("http://127.0.0.1:9000")
         else:
-            raise
+            raise e
 
     s = f.read()
     assert s == b"Hello World!"
@@ -142,7 +144,7 @@ def test_multi_servers(manager, watcher):
     s = f.read()
     assert s == b"Hello World!"
 
-    f = urlopen(secure_server.http.base)
+    f = urlopen(secure_server.http.base, context=SSL_CONTEXT)
     s = f.read()
     assert s == b"Hello World!"