From 869432f9ab4772da2d728733838744244402ed13 Mon Sep 17 00:00:00 2001
From: Collin RM Stocks <collinstocks@gmail.com>
Date: Fri, 22 Apr 2016 00:32:17 -0400
Subject: [PATCH] green.urllib2: missing patched ssl module

---
 AUTHORS                   | 1 +
 eventlet/green/urllib2.py | 2 ++
 tests/hub_test.py         | 2 +-
 tests/zmq_test.py         | 2 ++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 69e38c5..bb68c3b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -130,3 +130,4 @@ Thanks To
 * Josh VanderLinden
 * Levente Polyak
 * Phus Lu
+* Collin Stocks, fixing eventlet.green.urllib2.urlopen() so it accepts cafile, capath, or cadefault arguments
diff --git a/eventlet/green/urllib2.py b/eventlet/green/urllib2.py
index 7a1c370..c53ecbb 100644
--- a/eventlet/green/urllib2.py
+++ b/eventlet/green/urllib2.py
@@ -2,6 +2,7 @@ from eventlet import patcher
 from eventlet.green import ftplib
 from eventlet.green import httplib
 from eventlet.green import socket
+from eventlet.green import ssl
 from eventlet.green import time
 from eventlet.green import urllib
 
@@ -10,6 +11,7 @@ patcher.inject(
     globals(),
     ('httplib', httplib),
     ('socket', socket),
+    ('ssl', ssl),
     ('time', time),
     ('urllib', urllib))
 
diff --git a/tests/hub_test.py b/tests/hub_test.py
index 07e502a..fc0ce6f 100644
--- a/tests/hub_test.py
+++ b/tests/hub_test.py
@@ -246,7 +246,7 @@ class TestHubBlockingDetector(LimitedTestCase):
 
 
 class TestSuspend(LimitedTestCase):
-    TEST_TIMEOUT = 3
+    TEST_TIMEOUT = 4
     longMessage = True
     maxDiff = None
 
diff --git a/tests/zmq_test.py b/tests/zmq_test.py
index 734dff4..2910c11 100644
--- a/tests/zmq_test.py
+++ b/tests/zmq_test.py
@@ -19,6 +19,8 @@ def zmq_supported(_):
 
 
 class TestUpstreamDownStream(tests.LimitedTestCase):
+    TEST_TIMEOUT = 2
+
     @tests.skip_unless(zmq_supported)
     def setUp(self):
         super(TestUpstreamDownStream, self).setUp()