Code Review
/
packages
/
trusty
/
python-eventlet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add python-eventlet package to MOS 8.0 repository
[packages/trusty/python-eventlet.git]
/
python-eventlet
/
tests
/
test__greenness.py
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 7d9089089fada8a4624249ea1249c99facb29f32..a594b4da4d74738ec0d96f6276fd905283f477cc 100644
(file)
--- 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
"""
import unittest
-from eventlet.green import
urllib2,
BaseHTTPServer
+from eventlet.green import BaseHTTPServer
from eventlet import spawn, kill
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):
class QuietHandler(BaseHTTPServer.BaseHTTPRequestHandler):
@@
-40,12
+47,12
@@
class TestGreenness(unittest.TestCase):
self.server.server_close()
kill(self.gthread)
self.server.server_close()
kill(self.gthread)
- def test_urllib
2
(self):
+ def test_urllib(self):
self.assertEqual(self.server.request_count, 0)
try:
self.assertEqual(self.server.request_count, 0)
try:
- url
lib2.url
open('http://127.0.0.1:%s' % self.port)
+ urlopen('http://127.0.0.1:%s' % self.port)
assert False, 'should not get there'
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)
assert ex.code == 501, repr(ex)
self.assertEqual(self.server.request_count, 1)