Merge branch 'master' into dependabot/pip/pytest-cov-6.0.0

aio-libs · Nov 25, 2024 · 82d0077 · 82d0077
2 parents 54a6af0 + 0b72879
commit 82d0077
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 -e .
 
 aiomcache==0.8.2
-aiohttp==3.10.10
+aiohttp==3.11.7
 marshmallow==3.22.0
 msgpack==1.1.0
 pytest==8.3.3

diff --git a/tests/performance/test_concurrency.py b/tests/performance/test_concurrency.py
@@ -20,7 +20,9 @@ def server(request):
     p.join(timeout=15)
 
 
-@pytest.mark.xfail(reason="currently fails >85% of requests on GitHub runner, requires several re-runs to pass")
+@pytest.mark.xfail(reason="currently fails >85% of requests on GitHub runner, "
+                   "requires several re-runs to pass",
+                   strict=False)
 @pytest.mark.skipif(platform.python_implementation() == "PyPy", reason="Not working currently.")
 def test_concurrency_error_rates(server):
     """Test with Apache benchmark tool."""