From 9b838f491f895c8b46778c38953295364999aaee Mon Sep 17 00:00:00 2001
From: Reagan Lee <96998476+reaganjlee@users.noreply.github.com>
Date: Fri, 16 Feb 2024 14:01:41 +0200
Subject: [PATCH] recwarn: fix pytest.warns handling of Warnings with multiple
 arguments

Fix #11906
---
 changelog/11906.bugfix.rst |  1 +
 src/_pytest/recwarn.py     |  8 ++++----
 testing/test_recwarn.py    | 14 ++++++++++++++
 3 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 changelog/11906.bugfix.rst

diff --git a/changelog/11906.bugfix.rst b/changelog/11906.bugfix.rst
new file mode 100644
index 000000000..68bede540
--- /dev/null
+++ b/changelog/11906.bugfix.rst
@@ -0,0 +1 @@
+Fix regression with :func:`pytest.warns` using custom warning subclasses which have more than one parameter in their `__init__`.
diff --git a/src/_pytest/recwarn.py b/src/_pytest/recwarn.py
index 9eced36ff..bcf9f1466 100644
--- a/src/_pytest/recwarn.py
+++ b/src/_pytest/recwarn.py
@@ -334,10 +334,10 @@ class WarningsChecker(WarningsRecorder):
             for w in self:
                 if not self.matches(w):
                     warnings.warn_explicit(
-                        str(w.message),
-                        w.message.__class__,  # type: ignore[arg-type]
-                        w.filename,
-                        w.lineno,
+                        message=w.message,
+                        category=w.category,
+                        filename=w.filename,
+                        lineno=w.lineno,
                         module=w.__module__,
                         source=w.source,
                     )
diff --git a/testing/test_recwarn.py b/testing/test_recwarn.py
index edd4f51b5..27ee9aa72 100644
--- a/testing/test_recwarn.py
+++ b/testing/test_recwarn.py
@@ -581,3 +581,17 @@ def test_raise_type_error_on_invalid_warning_message_cpython() -> None:
         with warnings.catch_warnings():
             warnings.filterwarnings("ignore", "test")
             warnings.warn(1)  # type: ignore
+
+
+def test_multiple_arg_custom_warning() -> None:
+    """Test for issue #11906."""
+
+    class CustomWarning(UserWarning):
+        def __init__(self, a, b):
+            pass
+
+    with pytest.warns(CustomWarning):
+        with pytest.raises(pytest.fail.Exception, match="DID NOT WARN"):
+            with pytest.warns(CustomWarning, match="not gonna match"):
+                a, b = 1, 2
+                warnings.warn(CustomWarning(a, b))