Do not double-wrap resolver errors

Backport of a fix in the version 3.1 branch

Author: Cito

src/graphql/execution/execute.py

@@ -626,17 +626,13 @@ def resolve_field_value_or_error(
                 async def await_result():
                     try:
                         return await result
-                    except GraphQLError as error:
-                        return error
                     except Exception as error:
-                        return GraphQLError(str(error), original_error=error)
+                        return error
 
                 return await_result()
             return result
-        except GraphQLError as error:
-            return error
         except Exception as error:
-            return GraphQLError(str(error), original_error=error)
+            return error
 
     def complete_value_catching_error(
         self,

tests/execution/test_resolve.py

@@ -1,4 +1,6 @@
 from graphql import graphql_sync
+from graphql.error import GraphQLError
+from graphql.language import SourceLocation
 from graphql.type import (
     GraphQLArgument,
     GraphQLField,
@@ -165,3 +167,29 @@ def transforms_arguments_with_inputs_using_out_names():
             },
             None,
         )
+
+    def pass_error_from_resolver_wrapped_as_located_graphql_error():
+        def resolve(_obj, _info):
+            raise ValueError("Some error")
+
+        schema = _test_schema(GraphQLField(GraphQLString, resolve=resolve))
+        result = graphql_sync(schema, "{ test }")
+
+        assert result == (
+            {"test": None},
+            [{"message": "Some error", "locations": [(1, 3)], "path": ["test"]}],
+        )
+
+        assert result.errors is not None
+        error = result.errors[0]
+        assert isinstance(error, GraphQLError)
+        assert str(error) == "Some error\n\nGraphQL request:1:3\n1 | { test }\n  |   ^"
+        assert error.positions == [2]
+        locations = error.locations
+        assert locations == [(1, 3)]
+        location = locations[0]
+        assert isinstance(location, SourceLocation)
+        assert location == SourceLocation(1, 3)
+        original_error = error.original_error
+        assert isinstance(original_error, ValueError)
+        assert str(original_error) == "Some error"