X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=python-eventlet%2Ftests%2Ftest__greenness.py;fp=eventlet%2Ftests%2Ftest__greenness.py;h=a594b4da4d74738ec0d96f6276fd905283f477cc;hb=refs%2Fheads%2Fpre_1529660_master;hp=7d9089089fada8a4624249ea1249c99facb29f32;hpb=376ff3bfe7071cc0793184a378c4e74508fb0d97;p=packages%2Ftrusty%2Fpython-eventlet.git

diff --git a/eventlet/tests/test__greenness.py b/python-eventlet/tests/test__greenness.py
similarity index 79%
rename from eventlet/tests/test__greenness.py
rename to python-eventlet/tests/test__greenness.py
index 7d90890..a594b4d 100644
--- a/eventlet/tests/test__greenness.py
+++ b/python-eventlet/tests/test__greenness.py
@@ -4,8 +4,15 @@ If either operation blocked the whole script would block and timeout.
 """
 import unittest
 
-from eventlet.green import urllib2, BaseHTTPServer
+from eventlet.green import BaseHTTPServer
 from eventlet import spawn, kill
+from eventlet.support import six
+
+if six.PY2:
+    from eventlet.green.urllib2 import HTTPError, urlopen
+else:
+    from eventlet.green.urllib.request import urlopen
+    from eventlet.green.urllib.error import HTTPError
 
 
 class QuietHandler(BaseHTTPServer.BaseHTTPRequestHandler):
@@ -40,12 +47,12 @@ class TestGreenness(unittest.TestCase):
         self.server.server_close()
         kill(self.gthread)
 
-    def test_urllib2(self):
+    def test_urllib(self):
         self.assertEqual(self.server.request_count, 0)
         try:
-            urllib2.urlopen('http://127.0.0.1:%s' % self.port)
+            urlopen('http://127.0.0.1:%s' % self.port)
             assert False, 'should not get there'
-        except urllib2.HTTPError as ex:
+        except HTTPError as ex:
             assert ex.code == 501, repr(ex)
         self.assertEqual(self.server.request_count, 1)