From 5179ed7cf382e5c0562399ba50d93323c6b3396e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 25 Nov 2022 12:39:56 +0100
Subject: [PATCH] Avoid deprecated pytest.warns(None)

    tests/unit/config/test_config.py::TestConfigTestEnv::test_default_single_digit_factors
    tests/unit/config/test_config.py::TestConfigTestEnv::test_default_single_digit_factors
    tests/unit/config/test_config.py::TestConfigTestEnv::test_default_factors_conflict_ignore
      /usr/lib/python3.11/site-packages/_pytest/python.py:192: PytestRemovedIn8Warning: Passing None has been deprecated.
      See https://docs.pytest.org/en/latest/how-to/capture-warnings.html#additional-use-cases-of-warnings-in-tests for alternatives in common use cases.
---
 tests/unit/config/test_config.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
index a45472606..6be7eaf57 100644
--- a/tests/unit/config/test_config.py
+++ b/tests/unit/config/test_config.py
@@ -2,6 +2,7 @@
 import os
 import re
 import sys
+import warnings
 from textwrap import dedent
 
 import py
@@ -2469,7 +2470,8 @@ def get_executable(self, envconfig):
 
         major, minor = sys.version_info[0:2]
 
-        with pytest.warns(None) as lying:
+        with warnings.catch_warnings():
+            warnings.simplefilter("error")
             config = newconfig(
                 """
                 [testenv:py{0}]
@@ -2483,9 +2485,9 @@ def get_executable(self, envconfig):
 
         env_config = config.envconfigs["py{}".format(major)]
         assert env_config.basepython == "python{}.{}".format(major, minor - 1)
-        assert len(lying) == 0, "\n".join(repr(r.message) for r in lying)
 
-        with pytest.warns(None) as truthful:
+        with warnings.catch_warnings():
+            warnings.simplefilter("error")
             config = newconfig(
                 """
                 [testenv:py{0}]
@@ -2499,10 +2501,10 @@ def get_executable(self, envconfig):
 
         env_config = config.envconfigs["py{}".format(major)]
         assert env_config.basepython == "python{}.{}".format(major, minor)
-        assert len(truthful) == 0, "\n".join(repr(r.message) for r in truthful)
 
     def test_default_factors_conflict_ignore(self, newconfig, capsys):
-        with pytest.warns(None) as record:
+        with warnings.catch_warnings():
+            warnings.simplefilter("error")
             config = newconfig(
                 """
                 [tox]
@@ -2516,7 +2518,6 @@ def test_default_factors_conflict_ignore(self, newconfig, capsys):
         assert len(config.envconfigs) == 1
         envconfig = config.envconfigs["py27"]
         assert envconfig.basepython == "python2.7"
-        assert len(record) == 0, "\n".join(repr(r.message) for r in record)
 
     def test_factors_in_boolean(self, newconfig):
         inisource = """