Use match parameter in pytest.raises where appropriate

Author: Cito

tests/subscription/test_subscribe.py

@@ -306,13 +306,10 @@ async def throws_an_error_if_schema_is_missing():
 
         assert str(exc_info.value) == "Expected None to be a GraphQL schema."
 
-        with raises(TypeError) as exc_info:
+        with raises(TypeError, match="missing .* positional argument: 'schema'"):
             # noinspection PyTypeChecker
             await subscribe(document=document)
 
-        msg = str(exc_info.value)
-        assert "missing" in msg and "argument: 'schema'" in msg
-
     # noinspection PyArgumentList
     @mark.asyncio
     async def throws_an_error_if_document_is_missing():
@@ -322,13 +319,10 @@ async def throws_an_error_if_document_is_missing():
 
         assert str(exc_info.value) == "Must provide document"
 
-        with raises(TypeError) as exc_info:
+        with raises(TypeError, match="missing .* positional argument: 'document'"):
             # noinspection PyTypeChecker
             await subscribe(schema=email_schema)
 
-        msg = str(exc_info.value)
-        assert "missing" in msg and "argument: 'document'" in msg
-
     @mark.asyncio
     async def resolves_to_an_error_for_unknown_subscription_field():
         ast = parse(

tests/type/test_definition.py

@@ -403,12 +403,12 @@ def rejects_an_object_type_with_incorrectly_typed_field_args():
 
     def does_not_accept_is_deprecated_instead_of_deprecation_reason_on_field():
         kwargs = dict(is_deprecated=True)
-        with raises(TypeError) as exc_info:
+        with raises(
+            TypeError, match="got an unexpected keyword argument 'is_deprecated'"
+        ):
             GraphQLObjectType(
                 "OldObject", {"field": GraphQLField(GraphQLString, **kwargs)}
             )
-        msg = str(exc_info.value)
-        assert "got an unexpected keyword argument 'is_deprecated'" in msg
 
 
 def describe_object_interfaces_must_be_a_sequence():
@@ -558,11 +558,11 @@ def accepts_a_scalar_type_defining_serialize():
         schema_with_field_type(GraphQLScalarType("SomeScalar", lambda: None))
 
     def rejects_a_scalar_type_not_defining_serialize():
-        with raises(TypeError) as exc_info:
+        with raises(
+            TypeError, match="missing 1 required positional argument: 'serialize'"
+        ):
             # noinspection PyArgumentList
             schema_with_field_type(GraphQLScalarType("SomeScalar"))
-        msg = str(exc_info.value)
-        assert "missing 1 required positional argument: 'serialize'" in msg
         with raises(TypeError) as exc_info:
             # noinspection PyTypeChecker
             schema_with_field_type(GraphQLScalarType("SomeScalar", None))
@@ -663,11 +663,9 @@ def accepts_a_union_type_with_function_returning_a_list_of_types():
         schema_with_field_type(GraphQLUnionType("SomeUnion", lambda: [ObjectType]))
 
     def accepts_a_union_type_without_types():
-        with raises(TypeError) as exc_info:
+        with raises(TypeError, match="missing 1 required positional argument: 'types'"):
             # noinspection PyArgumentList
             schema_with_field_type(GraphQLUnionType("SomeUnion"))
-        msg = str(exc_info.value)
-        assert "missing 1 required positional argument: 'types'" in msg
         schema_with_field_type(GraphQLUnionType("SomeUnion", None))
         schema_with_field_type(GraphQLUnionType("SomeUnion", []))
 
@@ -726,14 +724,12 @@ def rejects_an_input_object_type_with_incorrect_fields_function():
 
 def describe_type_system_input_objects_fields_must_not_have_resolvers():
     def rejects_an_input_object_type_with_resolvers():
-        with raises(TypeError) as exc_info:
+        with raises(TypeError, match="got an unexpected keyword argument 'resolve'"):
             # noinspection PyArgumentList
             GraphQLInputObjectType(
                 "SomeInputObject",
                 {"f": GraphQLInputField(GraphQLString, resolve=lambda: 0)},
             )
-        msg = str(exc_info.value)
-        assert "got an unexpected keyword argument 'resolve'" in msg
         input_obj_type = GraphQLInputObjectType(
             "SomeInputObject", {"f": GraphQLField(GraphQLString, resolve=lambda: 0)}
         )
@@ -746,13 +742,11 @@ def rejects_an_input_object_type_with_resolvers():
         )
 
     def rejects_an_input_object_type_with_resolver_constant():
-        with raises(TypeError) as exc_info:
+        with raises(TypeError, match="got an unexpected keyword argument 'resolve'"):
             # noinspection PyArgumentList
             GraphQLInputObjectType(
                 "SomeInputObject", {"f": GraphQLInputField(GraphQLString, resolve={})}
             )
-        msg = str(exc_info.value)
-        assert "got an unexpected keyword argument 'resolve'" in msg
 
 
 def describe_type_system_enum_types_must_be_well_defined():
@@ -781,11 +775,11 @@ def rejects_an_enum_type_with_incorrectly_typed_values():
         )
 
     def does_not_allow_is_deprecated():
-        with raises(TypeError) as exc_info:
+        with raises(
+            TypeError, match="got an unexpected keyword argument 'is_deprecated'"
+        ):
             # noinspection PyArgumentList
             GraphQLEnumType("SomeEnum", {"FOO": GraphQLEnumValue(is_deprecated=True)})
-        msg = str(exc_info.value)
-        assert "got an unexpected keyword argument 'is_deprecated'" in msg
 
 
 def describe_type_system_list_must_accept_only_types():

tests/utilities/test_assert_valid_name.py

@@ -22,7 +22,5 @@ def throws_for_non_strings():
         assert msg == "Expected string"
 
     def throws_for_names_with_invalid_characters():
-        with raises(GraphQLError) as exc_info:
+        with raises(GraphQLError, match="Names must match"):
             assert_valid_name(">--()-->")
-        msg = exc_info.value.message
-        assert "Names must match" in msg