Improved promise async integration. Fixed #67

Author: syrusakbary

.travis.yml

@@ -22,7 +22,7 @@ before_install:
         source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate"
       fi
 install:
-- pip install --cache-dir $HOME/.cache/pip pytest-cov pytest-mock coveralls flake8 isort==3.9.6 gevent==1.1b5 six>=1.10.0 promise>=0.4.0
+- pip install --cache-dir $HOME/.cache/pip pytest-cov pytest-mock coveralls flake8 isort==3.9.6 gevent==1.1b5 six>=1.10.0 promise>=0.4.2
 - pip install --cache-dir $HOME/.cache/pip pytest>=2.7.3 --upgrade
 - pip install -e .
 script:

graphql/execution/tests/test_executor_asyncio.py

@@ -2,6 +2,7 @@
    isort:skip_file
 """
 # flake8: noqa
+
 import pytest
 asyncio = pytest.importorskip("asyncio")
 

graphql/execution/tests/test_executor_gevent.py

@@ -2,6 +2,7 @@
    isort:skip_file
 """
 # flake8: noqa
+
 import pytest
 gevent = pytest.importorskip("gevent")
 

setup.py

@@ -45,7 +45,7 @@
     packages=find_packages(exclude=['tests', 'tests_py35']),
     install_requires=[
         'six>=1.10.0',
-        'promise>=0.4.0'
+        'promise>=0.4.2'
     ],
     tests_require=[
         'pytest>=2.7.3',

tests_py35/core_execution/test_asyncio_executor.py

@@ -1,5 +1,5 @@
 # flake8: noqa
-
+import pytest
 import asyncio
 import functools
 from graphql.error import format_error
@@ -39,8 +39,7 @@ def resolver_3(context, *_):
     assert result.data == {'a': 'hey', 'b': 'hey2', 'c': 'hey3'}
 
 
-@pytest.mark.asyncio
-async def test_asyncio_py35_executor_return_promise(event_loop):
+def test_asyncio_py35_executor_return_promise():
     ast = parse('query Example { a, b, c }')
 
     async def resolver(context, *_):
@@ -60,9 +59,14 @@ def resolver_3(context, *_):
         'c': GraphQLField(GraphQLString, resolver=resolver_3)
     })
 
-    result = await execute(GraphQLSchema(Type), ast, executor=AsyncioExecutor(loop=event_loop), return_promise=True)
-    assert not result.errors
-    assert result.data == {'a': 'hey', 'b': 'hey2', 'c': 'hey3'}
+    loop = asyncio.get_event_loop()
+
+    async def do_exec():
+        result = await execute(GraphQLSchema(Type), ast, executor=AsyncioExecutor(loop), return_promise=True)
+        assert not result.errors
+        assert result.data == {'a': 'hey', 'b': 'hey2', 'c': 'hey3'}
+
+    loop.run_until_complete(do_exec())
 
 
 def test_asyncio_py35_executor_with_error():