Don't use executor in run_http_query when return_promise=True

Author: blazewicz

graphql_server/__init__.py

@@ -122,20 +122,32 @@ def run_http_query(
 
     all_params = [get_graphql_params(entry, extra_data) for entry in data]
 
-    executor = execute_options.get("executor")
-    response_executor = executor if executor else SyncExecutor()
-
-    response_promises = [
-        response_executor.execute(
-            get_response, schema, params, catch_exc, allow_only_query, **execute_options
-        )
-        for params in all_params
-    ]
-    response_executor.wait_until_finished()
-
-    results = [
-        result.get() if is_thenable(result) else result for result in response_promises
-    ]
+    if execute_options.get("return_promise"):
+        results = [
+            get_response(schema, params, catch_exc, allow_only_query, **execute_options)
+            for params in all_params
+        ]
+    else:
+        executor = execute_options.get("executor")
+        response_executor = executor if executor else SyncExecutor()
+
+        response_promises = [
+            response_executor.execute(
+                get_response,
+                schema,
+                params,
+                catch_exc,
+                allow_only_query,
+                **execute_options
+            )
+            for params in all_params
+        ]
+        response_executor.wait_until_finished()
+
+        results = [
+            result.get() if is_thenable(result) else result
+            for result in response_promises
+        ]
 
     return ServerResults(results, all_params)
 

tests/test_query.py

@@ -1,6 +1,7 @@
 import json
 
 from graphql.error import GraphQLError
+from promise import Promise
 
 from graphql_server import (
     HttpQueryError,
@@ -546,6 +547,34 @@ def execute(self, fn, *args, **kwargs):
 
     query = "{test}"
     results, params = run_http_query(
+        schema, "get", {}, dict(query=query), executor=TestExecutor(),
+    )
+
+    assert as_dicts(results) == [{"data": {"test": "Hello World"}}]
+    assert params == [RequestParams(query=query, variables=None, operation_name=None)]
+    assert TestExecutor.called
+    assert TestExecutor.waited
+    assert not TestExecutor.cleaned
+
+
+def test_get_reponses_using_executor_return_promise():
+    class TestExecutor(object):
+        called = False
+        waited = False
+        cleaned = False
+
+        def wait_until_finished(self):
+            TestExecutor.waited = True
+
+        def clean(self):
+            TestExecutor.cleaned = True
+
+        def execute(self, fn, *args, **kwargs):
+            TestExecutor.called = True
+            return fn(*args, **kwargs)
+
+    query = "{test}"
+    result_promises, params = run_http_query(
         schema,
         "get",
         {},
@@ -554,8 +583,10 @@ def execute(self, fn, *args, **kwargs):
         return_promise=True,
     )
 
+    results = Promise.all(result_promises).get()
+
     assert as_dicts(results) == [{"data": {"test": "Hello World"}}]
     assert params == [RequestParams(query=query, variables=None, operation_name=None)]
     assert TestExecutor.called
-    assert TestExecutor.waited
+    assert not TestExecutor.waited
     assert TestExecutor.cleaned