Commit 3ca670ef authored by Jason Madden's avatar Jason Madden Committed by GitHub

Merge pull request #1844 from gevent/py310final

Update to testing 3.10.0 final
parents e5c31feb 290af773
...@@ -145,7 +145,7 @@ jobs: ...@@ -145,7 +145,7 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
matrix: matrix:
python-version: [2.7, pypy-2.7, pypy-3.6, 3.6, 3.7, 3.8, 3.9, '3.10.0-rc.1'] python-version: [2.7, pypy-2.7, pypy-3.6, 3.6, 3.7, 3.8, 3.9, '3.10.0']
# ubuntu-latest is at least 20.04. But this breaks the SSL # ubuntu-latest is at least 20.04. But this breaks the SSL
# tests because Ubuntu increased the default OpenSSL # tests because Ubuntu increased the default OpenSSL
# strictness. # strictness.
...@@ -174,7 +174,7 @@ jobs: ...@@ -174,7 +174,7 @@ jobs:
- os: ubuntu-18.04 - os: ubuntu-18.04
python-version: 3.9 python-version: 3.9
- os: ubuntu-18.04 - os: ubuntu-18.04
python-version: '3.10.0-rc.1' python-version: '3.10.0'
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
......
...@@ -42,7 +42,7 @@ environment: ...@@ -42,7 +42,7 @@ environment:
# 64-bit # 64-bit
- PYTHON: "C:\\Python310-x64" - PYTHON: "C:\\Python310-x64"
PYTHON_VERSION: "3.10.0rc1" PYTHON_VERSION: "3.10.0"
PYTHON_ARCH: "64" PYTHON_ARCH: "64"
PYTHON_EXE: python PYTHON_EXE: python
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
......
...@@ -33,6 +33,9 @@ from test import support ...@@ -33,6 +33,9 @@ from test import support
# on platforms known to behave badly. # on platforms known to behave badly.
platforms_to_skip = ('netbsd5', 'hp-ux11') platforms_to_skip = ('netbsd5', 'hp-ux11')
# Is Python built with Py_DEBUG macro defined?
Py_DEBUG = hasattr(sys, 'gettotalrefcount')
def restore_default_excepthook(testcase): def restore_default_excepthook(testcase):
testcase.addCleanup(setattr, threading, 'excepthook', threading.excepthook) testcase.addCleanup(setattr, threading, 'excepthook', threading.excepthook)
...@@ -916,6 +919,16 @@ class ThreadTests(BaseTestCase): ...@@ -916,6 +919,16 @@ class ThreadTests(BaseTestCase):
threading.Thread(target=noop).start() threading.Thread(target=noop).start()
# Thread.join() is not called # Thread.join() is not called
@unittest.skipUnless(Py_DEBUG, 'need debug build (Py_DEBUG)')
def test_debug_deprecation(self):
# bpo-44584: The PYTHONTHREADDEBUG environment variable is deprecated
rc, out, err = assert_python_ok("-Wdefault", "-c", "pass",
PYTHONTHREADDEBUG="1")
msg = (b'DeprecationWarning: The threading debug '
b'(PYTHONTHREADDEBUG environment variable) '
b'is deprecated and will be removed in Python 3.12')
self.assertIn(msg, err)
class ThreadJoinOnShutdown(BaseTestCase): class ThreadJoinOnShutdown(BaseTestCase):
......
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