Commit 6966479f authored by Jason Madden's avatar Jason Madden

Run more tests on 3.9; fix an ExpectedError leaking in PURE_PYTHON mode.

parent 33b6bc9d
...@@ -329,26 +329,25 @@ jobs: ...@@ -329,26 +329,25 @@ jobs:
# For the CPython interpreters, unless we have reason to expect # For the CPython interpreters, unless we have reason to expect
# different behaviour across the versions (e.g., as measured by coverage) # different behaviour across the versions (e.g., as measured by coverage)
# it's sufficient to run the full suite on the current version. # it's sufficient to run the full suite on the current version
# and oldest version.
# XXX: Move these to 3.9 once the basic tests get worked out.
# 3.8 # 3.8
- <<: *test-libuv-jobs - <<: *test-libuv-jobs
env: TRAVIS_PYTHON_VERSION=3.8 env: TRAVIS_PYTHON_VERSION=3.9
name: libuv38 name: libuv38
- <<: *test-libev-jobs - <<: *test-libev-jobs
env: TRAVIS_PYTHON_VERSION=3.8 env: TRAVIS_PYTHON_VERSION=3.9
name: libev-cffi38 name: libev-cffi38
- <<: *test-ares-jobs - <<: *test-ares-jobs
env: TRAVIS_PYTHON_VERSION=3.8 env: TRAVIS_PYTHON_VERSION=3.9
name: c-ares resolver on Python 3.8 name: c-ares resolver on Python 3.9
- <<: *test-dnspython-jobs - <<: *test-dnspython-jobs
env: TRAVIS_PYTHON_VERSION=3.8 env: TRAVIS_PYTHON_VERSION=3.9
name: dnspython resolver on Python 3.8 name: dnspython resolver on Python 3.9
- <<: *test-pure-jobs - <<: *test-pure-jobs
env: TRAVIS_PYTHON_VERSION=3.8 env: TRAVIS_PYTHON_VERSION=3.9
name: pure-Python on Python 3.8 name: pure-Python on Python 3.9
# 2.7, no-embed. Run the tests that exercise the libraries we # 2.7, no-embed. Run the tests that exercise the libraries we
# linked to. # linked to.
......
...@@ -21,7 +21,7 @@ if [ -d /gevent -a -d /opt/python ]; then ...@@ -21,7 +21,7 @@ if [ -d /gevent -a -d /opt/python ]; then
cd /gevent cd /gevent
rm -rf wheelhouse rm -rf wheelhouse
mkdir wheelhouse mkdir wheelhouse
for variant in `ls -d /opt/python/cp{27,35,36,37,38}*`; do for variant in `ls -d /opt/python/cp{27,35,36,37,38,39}*`; do
echo "Building $variant" echo "Building $variant"
mkdir /tmp/build mkdir /tmp/build
cd /tmp/build cd /tmp/build
......
...@@ -22,11 +22,14 @@ class TestKillWithException(greentest.TestCase): ...@@ -22,11 +22,14 @@ class TestKillWithException(greentest.TestCase):
def test_kill_with_exception(self): def test_kill_with_exception(self):
# issue-607 pointed this case. # issue-607 pointed this case.
g = gevent.spawn(f) g = gevent.spawn(f)
with gevent.get_hub().ignoring_expected_test_error():
# Hmm, this only needs the `with ignoring...` in
# PURE_PYTHON mode (or PyPy).
g.kill(ExpectedError) g.kill(ExpectedError)
assert not g.successful() self.assertFalse(g.successful())
self.assertRaises(ExpectedError, g.get) self.assertRaises(ExpectedError, g.get)
assert g.value is None self.assertIsNone(g.value)
assert isinstance(g.exception, ExpectedError) self.assertIsInstance(g.exception, ExpectedError)
def test_kill_with_exception_after_started(self): def test_kill_with_exception_after_started(self):
with gevent.get_hub().ignoring_expected_test_error(): with gevent.get_hub().ignoring_expected_test_error():
......
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