Fix some broken tests in CI

Author: oremanj

.github/workflows/ci.yml

@@ -9,12 +9,12 @@ on:
 jobs:
   Windows:
     name: 'Windows (${{ matrix.python }}, ${{ matrix.arch }}${{ matrix.extra_name }})'
-    timeout-minutes: 20
+    timeout-minutes: 30
     runs-on: 'windows-latest'
     strategy:
       fail-fast: false
       matrix:
-        python: ['3.7', '3.8', '3.9', '3.10', '3.11', 'pypy-3.8-nightly', 'pypy-3.9-nightly']
+        python: ['3.7', '3.8', '3.9', '3.10', '3.11']
         arch: ['x86', 'x64']
         exclude:
           - python: 'pypy-3.8-nightly'
@@ -51,7 +51,7 @@ jobs:
 
   Ubuntu:
     name: 'Ubuntu (${{ matrix.python }}${{ matrix.extra_name }})'
-    timeout-minutes: 10
+    timeout-minutes: 20
     runs-on: 'ubuntu-latest'
     strategy:
       fail-fast: false
@@ -98,7 +98,7 @@ jobs:
 
   macOS:
     name: 'macOS (${{ matrix.python }})'
-    timeout-minutes: 10
+    timeout-minutes: 20
     runs-on: 'macos-latest'
     strategy:
       fail-fast: false

ci.sh

@@ -71,21 +71,18 @@ else
     mkdir empty || true
     cd empty
 
-    INSTALLDIR=$(python -c "import os, trio_asyncio; print(os.path.dirname(trio_asyncio.__file__))")
-    cp ../pyproject.toml $INSTALLDIR
-
-    # support subprocess spawning with coverage.py
-    echo "import coverage; coverage.process_startup()" | tee -a "$INSTALLDIR/../sitecustomize.py"
-
-    if COVERAGE_PROCESS_START=$(pwd)/../.coveragerc coverage run --rcfile=../.coveragerc -m pytest -r a --junitxml=../test-results.xml --verbose ../tests; then
+    cp ../pyproject.toml ../tests/
+
+    # We have to copy .coveragerc into this directory, rather than passing
+    # --cov-config=../.coveragerc to pytest, because codecov.sh will run
+    # 'coverage xml' to generate the report that it uses, and that will only
+    # apply the ignore patterns in the current directory's .coveragerc.
+    cp ../.coveragerc .
+    if pytest -ra --junitxml=../test-results.xml --cov=trio_asyncio --verbose ../tests; then
         PASSED=true
     else
         PASSED=false
     fi
 
-    coverage combine --rcfile ../.coveragerc
-    coverage report -m --rcfile ../.coveragerc
-    coverage xml --rcfile ../.coveragerc
-
     $PASSED
 fi

pyproject.toml

@@ -1,3 +1,20 @@
+[tool.pytest.ini_options]
+addopts = ["-p", "no:asyncio"]
+filterwarnings = [
+    "error",
+    "ignore:The loop argument is deprecated since Python 3.8:DeprecationWarning",
+    'ignore:"@coroutine" decorator is deprecated since Python 3.8:DeprecationWarning',
+    "default:Tried to add marker .* but that test doesn't exist.:RuntimeWarning",
+    "ignore:the imp module is deprecated in favour of importlib.*:DeprecationWarning",
+    "ignore:'AbstractChildWatcher' is deprecated.*:DeprecationWarning"
+]
+junit_family = "xunit2"
+xfail_strict = true
+
+[tool.flake8]
+max-line-length = 99
+extend-ignore = ['D', 'E402', 'E731', 'E127', 'E502', 'E123', 'W503']
+
 [tool.towncrier]
 package = "trio_asyncio"
 title_format = "trio-asyncio {version} ({project_date})"

setup.cfg

@@ -124,71 +124,37 @@ def skip(rel_id):
                 "test_tasks.py::RunCoroutineThreadsafeTests::"
                 "test_run_coroutine_threadsafe_task_cancelled"
             )
-            xfail(
-                "test_tasks.py::RunCoroutineThreadsafeTests::"
-                "test_run_coroutine_threadsafe_with_timeout"
-            )
+            if sys.version_info < (3, 11):
+                xfail(
+                    "test_tasks.py::RunCoroutineThreadsafeTests::"
+                    "test_run_coroutine_threadsafe_with_timeout"
+                )
             if sys.platform == "win32":
                 xfail("test_windows_events.py::ProactorLoopCtrlC::test_ctrl_c")
 
-        # The CPython SSL tests ignored here fail with
-        # ConnectionResetError on Pythons <= 3.7.x for some unknown x.
-        # (3.7.1 fails, 3.7.5 and 3.7.6 pass; older 3.6.x also affected)
-        if sys.platform != "win32":
-            import selectors
-
-            xfail_per_eventloop = []
-            if sys.implementation.name == "pypy":
-                # pypy uses a different spelling of the certificate
-                # failure error message which causes this test to spuriously fail
-                xfail_per_eventloop += [
-                    "test_create_server_ssl_match_failed"
-                ]
-            else:
-                if sys.version_info < (3, 8):
-                    xfail_per_eventloop += [
-                        "test_create_ssl_connection",
-                        "test_create_ssl_unix_connection"
-                    ]
-
-            kinds = ("Select",)
-            for candidate in ("Kqueue", "Epoll", "Poll"):
-                if hasattr(selectors, candidate + "Selector"):
-                    kinds += (candidate.replace("Epoll", "EPoll"),)
-            for kind in kinds:
-                for test in xfail_per_eventloop:
-                    xfail("test_events.py::{}EventLoopTests::{}".format(kind, test))
-
-            if sys.implementation.name != "pypy":
-                stream_suite = "StreamTests"
-                for which in ("open_connection", "open_unix_connection"):
-                    xfail(
-                        "test_streams.py::{}::test_{}_no_loop_ssl"
-                        .format(stream_suite, which)
-                    )
-
         if sys.implementation.name == "pypy":
-            # This fails due to a trivial difference in how pypy handles IPv6
-            # addresses
-            xfail(
-                "test_base_events.py::BaseEventLoopWithSelectorTests::"
-                "test_create_connection_ipv6_scope"
-            )
             # This test depends on the C implementation of asyncio.Future, and
             # unlike most such tests it is not configured to be skipped if
             # the C implementation is not available
             xfail(
                 "test_futures.py::CFutureInheritanceTests::"
                 "test_inherit_without_calling_super_init"
             )
-            # These tests assume CPython-style immediate finalization of
-            # objects when they become unreferenced
-            for test in (
-                "test_create_connection_memory_leak",
-                "test_handshake_timeout",
-                "test_start_tls_client_reg_proto_1",
-            ):
-                xfail("test_sslproto.py::SelectorStartTLSTests::{}".format(test))
+            if sys.version_info < (3, 8):
+                # This fails due to a trivial difference in how pypy handles IPv6
+                # addresses
+                xfail(
+                    "test_base_events.py::BaseEventLoopWithSelectorTests::"
+                    "test_create_connection_ipv6_scope"
+                )
+                # These tests assume CPython-style immediate finalization of
+                # objects when they become unreferenced
+                for test in (
+                    "test_create_connection_memory_leak",
+                    "test_handshake_timeout",
+                    "test_start_tls_client_reg_proto_1",
+                ):
+                    xfail("test_sslproto.py::SelectorStartTLSTests::{}".format(test))
 
         if sys.version_info >= (3, 11):
             # This tries to use a mock ChildWatcher that does something unlikely.
@@ -198,12 +164,8 @@ def skip(rel_id):
                 "test_subprocess.py::GenericWatcherTests::"
                 "test_create_subprocess_fails_with_inactive_watcher"
             )
+
+        if sys.version_info >= (3, 9):
             # This tries to create a new loop from within an existing one,
             # which we don't support.
             xfail("test_locks.py::ConditionTests::test_ambiguous_loops")
-            # This asserts that a deprecation warning refers to the point of
-            # the call, but our monkeypatching interposes another stack frame
-            xfail(
-                "test_events.py::TestCGetEventLoop::"
-                "test_get_event_loop_returns_running_loop2"
-            )

tests/pytest.ini

@@ -209,9 +209,13 @@ async def run_aio_coroutine(self, coro):
         This is a Trio-flavored async function.
 
         """
-        self._check_closed()
-        t = sniffio.current_async_library_cvar.set("asyncio")
-        fut = asyncio.ensure_future(coro, loop=self)
+        try:
+            self._check_closed()
+            t = sniffio.current_async_library_cvar.set("asyncio")
+            fut = asyncio.ensure_future(coro, loop=self)
+        except BaseException:
+            coro.close()  # avoid unawaited coroutine error
+            raise
         try:
             return await run_aio_future(fut)
         finally:

tests/python/conftest.py

@@ -201,10 +201,7 @@ def _new_policy_set(new_policy):
         raise RuntimeError("You can't set the Trio loop policy manually")
     if _in_trio_context():
         raise RuntimeError("You can't change the event loop policy in Trio context")
-    if (
-        new_policy is not None
-        and not isinstance(new_policy, asyncio.AbstractEventLoopPolicy)
-    ):
+    if (new_policy is not None and not isinstance(new_policy, asyncio.AbstractEventLoopPolicy)):
         # Raise the type of error that the CPython test suite expects
         raise_type = TypeError if sys.version_info >= (3, 11) else AssertionError
         raise raise_type(