Commit 521428eb authored by Jason Madden's avatar Jason Madden

Fix test__threading_vs_settrace.py since we don't run that on PyPy anymore.

parent accd9cf6
......@@ -109,7 +109,9 @@ bench:
${PYTHON} src/greentest/bench_sendall.py
travis_test_linters:
make lint
# XXX: prospector is failing right now. I can't reproduce locally:
# https://travis-ci.org/gevent/gevent/jobs/345474139
# make lint
make leaktest
make cffibackendtest
......
......@@ -6,7 +6,7 @@ wheel
# name to be created so that we can have both foo.py and _foo.so
# at the same time.
# This is an arbitrary commit that seems to work well.
-e git+https://github.com/cython/cython.git@63cd3bbb5eac22b92808eeb90b512359e3def20a#egg=cython
-e git+https://github.com/cython/cython.git@471025858954d5b8429a9361a77dc41c6650ac52#egg=cython
# Python 3.7b1 requires this.
greenlet>=0.4.13
......
......@@ -60,12 +60,11 @@ class TestTrace(unittest.TestCase):
old = sys.gettrace()
else:
old = None
PYPY = hasattr(sys, 'pypy_version_info')
lst = []
try:
def trace(frame, ev, _arg):
lst.append((frame.f_code.co_filename, frame.f_lineno, ev))
if not PYPY: # because we expect to trace on PyPy
print("TRACE: %s:%s %s" % lst[-1])
return trace
......@@ -91,7 +90,6 @@ class TestTrace(unittest.TestCase):
def trace(frame, ev, _arg):
with l:
lst.append((frame.f_code.co_filename, frame.f_lineno, ev))
if not PYPY: # because we expect to trace on PyPy
print("TRACE: %s:%s %s" % lst[-1])
return trace
......@@ -162,5 +160,4 @@ class TestTrace(unittest.TestCase):
if __name__ == "__main__":
import greentest
greentest.main()
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