Commit 023cdcbd authored by Jason Madden's avatar Jason Madden

Patch out one ares test for PyPy+libuv.

parent 5af25a91
...@@ -575,7 +575,7 @@ class TestCase(TestCaseMetaClass("NewBase", (BaseTestCase,), {})): ...@@ -575,7 +575,7 @@ class TestCase(TestCaseMetaClass("NewBase", (BaseTestCase,), {})):
_error = _none _error = _none
def expect_one_error(self): def expect_one_error(self):
assert self._error == self._none, self._error self.assertEqual(self._error, self._none)
self._old_handle_error = gevent.get_hub().handle_error self._old_handle_error = gevent.get_hub().handle_error
gevent.get_hub().handle_error = self._store_error gevent.get_hub().handle_error = self._store_error
......
...@@ -23,6 +23,7 @@ CPYTHON = not PYPY ...@@ -23,6 +23,7 @@ CPYTHON = not PYPY
WIN = sys.platform.startswith("win") WIN = sys.platform.startswith("win")
PY2 = sys.version_info[0] < 3 PY2 = sys.version_info[0] < 3
PY3 = sys.version_info[0] >= 3 PY3 = sys.version_info[0] >= 3
ARES = os.environ.get('GEVENT_RESOLVER') == 'ares'
# XXX: Formalize this better # XXX: Formalize this better
LIBUV = os.getenv('GEVENT_CORE_CFFI_ONLY') == 'libuv' or (PYPY and WIN) LIBUV = os.getenv('GEVENT_CORE_CFFI_ONLY') == 'libuv' or (PYPY and WIN)
...@@ -234,6 +235,16 @@ if LIBUV: ...@@ -234,6 +235,16 @@ if LIBUV:
'test_subprocess.POSIXProcessTestCase.test_close_fds_0_2', 'test_subprocess.POSIXProcessTestCase.test_close_fds_0_2',
] ]
if PYPY:
if ARES:
disabled_tests += [
# This can timeout with a socket timeout in ssl.wrap_socket(c)
# on Travis. I can't reproduce locally.
'test_ssl.ThreadedTests.test_handshake_timeout',
]
if PY3: if PY3:
disabled_tests += [ disabled_tests += [
...@@ -814,7 +825,7 @@ if sys.version_info[:2] >= (3, 5): ...@@ -814,7 +825,7 @@ if sys.version_info[:2] >= (3, 5):
'test_socket.TestExceptions.test_setblocking_invalidfd', 'test_socket.TestExceptions.test_setblocking_invalidfd',
] ]
if os.environ.get('GEVENT_RESOLVER') == 'ares': if ARES:
disabled_tests += [ disabled_tests += [
# These raise different errors or can't resolve # These raise different errors or can't resolve
# the IP address correctly # the IP address correctly
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment