From 72515c8d707a55f528dc604b4dd5f222ad5c22c2 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 5 Nov 2020 21:18:30 +0100 Subject: [PATCH] fixup! test_node_from_parent_kwonly --- testing/test_nodes.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/testing/test_nodes.py b/testing/test_nodes.py index a2dd895aead..add370141f4 100644 --- a/testing/test_nodes.py +++ b/testing/test_nodes.py @@ -1,3 +1,5 @@ +import sys + import pytest from _pytest import nodes from _pytest.compat import TYPE_CHECKING @@ -30,14 +32,22 @@ def test_node_from_parent_kwonly(request: "FixtureRequest") -> None: This can lead to confusing TypeErrors, but is kept like that for (backward) compatibility.""" session = request.session + if sys.version_info >= (3, 10): + prefix_name = "nodes.Node." + else: + prefix_name = "" with pytest.raises( TypeError, - match=r"__init__\(\) missing 1 required positional argument: 'name'" + match=r"^{}__init__\(\) missing 1 required positional argument: 'name'$".format( + prefix_name + ), ): nodes.Node.from_parent(session) with pytest.raises( TypeError, - match=r'^from_parent\(\) takes 2 positional arguments but 3 were given$' + match=r'^{}from_parent\(\) takes 2 positional arguments but 3 were given$'.format( + prefix_name + ) ): nodes.Node.from_parent(session, "myname") # type: ignore[call-arg] node = nodes.Node.from_parent(session, name="myname")