Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gevent
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gevent
Commits
023cdcbd
Commit
023cdcbd
authored
Jan 15, 2018
by
Jason Madden
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Patch out one ares test for PyPy+libuv.
parent
5af25a91
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
src/greentest/greentest.py
src/greentest/greentest.py
+1
-1
src/greentest/patched_tests_setup.py
src/greentest/patched_tests_setup.py
+12
-1
No files found.
src/greentest/greentest.py
View file @
023cdcbd
...
@@ -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
...
...
src/greentest/patched_tests_setup.py
View file @
023cdcbd
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment