diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b0a2cf9d..d7331c75 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,10 +28,15 @@ jobs: sudo apt install libev-dev libevent-dev sudo apt install gcc make libffi-dev pkg-config zlib1g-dev libbz2-dev libsqlite3-dev libncurses5-dev libexpat1-dev libssl-dev libgdbm-dev tk-dev libgc-dev python-cffi liblzma-dev libncursesw5-dev sudo ldconfig - - name: Install test dependencies - run: pip install tox coveralls + + - name: Install uv + run: pip install uv + + - name: Install Python package and test dependencies + run: uv pip install .[test] && uv pip freeze + - name: Run test suite - run: tox -v -e py + run: pytest multi-os: @@ -56,11 +61,13 @@ jobs: with: python-version: '3.8' - - name: Install test dependencies - run: | - pip install tox coveralls + - name: Install uv + run: pip install uv + + - name: Install Python package and test dependencies + run: uv pip install .[test] && uv pip freeze - name: Run test suite shell: bash -l {0} - run: tox -v -e py + run: pytest continue-on-error: ${{ matrix.skip-tests }} diff --git a/tests/test_stdin_socket.py b/tests/test_stdin_socket.py index da8efba5..74672873 100644 --- a/tests/test_stdin_socket.py +++ b/tests/test_stdin_socket.py @@ -2,6 +2,7 @@ import tornado import time import socket +import subprocess from tests.support import TestCircus, TimeoutException from tests.support import skipIf, IS_WINDOWS @@ -18,7 +19,7 @@ def run_process(test_file): return 1 -@tornado.testing.gen_test +@tornado.gen.coroutine def read_from_stream(stream, timeout=5): start = time.time() while time.time() - start < timeout: @@ -63,7 +64,7 @@ def test_stdin_socket_missing_raises(self): try: # expecting exception for no such socket yield self.start_arbiter(stdin_socket='test') - except Exception: + except subprocess.SubprocessError: raised = True self.assertTrue(raised)