Merge separate tests directory for Py36 to main one

Since we require Python 3.6+ now, we can have a common test directory.

Author: Cito

MANIFEST.in

@@ -12,8 +12,7 @@ include tox.ini
 
 include scripts/gql-cli
 
-recursive-include tests *.py *.yaml *.graphql
-recursive-include tests_py36 *.py *.cnf *.pem
+recursive-include tests *.py *.graphql *.cnf *.yaml *.pem
 
 prune gql-checker
 

Makefile

@@ -4,10 +4,10 @@ dev-setup:
 	python pip install -e ".[test]"
 
 tests:
-	pytest tests tests_py36 --cov=gql --cov-report=term-missing -vv
+	pytest tests --cov=gql --cov-report=term-missing -vv
 
 all_tests:
-	pytest tests tests_py36 --cov=gql --cov-report=term-missing --run-online -vv
+	pytest tests --cov=gql --cov-report=term-missing --run-online -vv
 
 clean:
 	find . -name "*.pyc" -delete

tests_py36/conftest.py renamed to tests/conftest.py

@@ -20,13 +20,13 @@ def pytest_addoption(parser):
         "--run-online",
         action="store_true",
         default=False,
-        help="run tests necessitating online ressources",
+        help="run tests necessitating online resources",
     )
 
 
 def pytest_configure(config):
     config.addinivalue_line(
-        "markers", "online: mark test as necessitating external online ressources"
+        "markers", "online: mark test as necessitating external online resources"
     )
 
 
@@ -164,8 +164,11 @@ async def wait_connection_terminate(ws):
 
 
 def get_server_handler(request):
-    """ Get the server handler provided from test or use the default
-    server handler if the test provides only an array of answers"""
+    """Get the server handler.
+
+    Either get it from test or use the default server handler
+    if the test provides only an array of answers.
+    """
 
     if isinstance(request.param, types.FunctionType):
         server_handler = request.param
@@ -184,8 +187,7 @@ async def default_server_handler(ws, path):
                     print(f"Server received: {result}")
 
                     if isinstance(answer, str) and "{query_id}" in answer:
-                        answer_format_params = {}
-                        answer_format_params["query_id"] = query_id
+                        answer_format_params = {"query_id": query_id}
                         formatted_answer = answer.format(**answer_format_params)
                     else:
                         formatted_answer = answer
@@ -206,7 +208,7 @@ async def default_server_handler(ws, path):
 
 @pytest.fixture
 async def ws_ssl_server(request):
-    """websockets server fixture using ssl
+    """Websockets server fixture using SSL.
 
     It can take as argument either a handler function for the websocket server for complete control
     OR an array of answers to be sent by the default server handler
@@ -229,7 +231,7 @@ async def ws_ssl_server(request):
 
 @pytest.fixture
 async def server(request):
-    """server is a fixture used to start a dummy server to test the client behaviour.
+    """Fixture used to start a dummy server to test the client behaviour.
 
     It can take as argument either a handler function for the websocket server for complete control
     OR an array of answers to be sent by the default server handler
@@ -252,7 +254,7 @@ async def server(request):
 
 @pytest.fixture
 async def client_and_server(server):
-    """client_and_server is a helper fixture to start a server and a client connected to its port"""
+    """Helper fixture to start a server and a client connected to its port."""
 
     # Generate transport to connect to the server fixture
     path = "/graphql"

tests/starwars/schema.py

@@ -1,3 +1,5 @@
+import asyncio
+
 from graphql import (
     GraphQLArgument,
     GraphQLEnumType,
@@ -12,6 +14,9 @@
     GraphQLObjectType,
     GraphQLSchema,
     GraphQLString,
+    get_introspection_query,
+    graphql_sync,
+    print_schema,
 )
 
 from .fixtures import (
@@ -21,6 +26,7 @@
     getFriends,
     getHero,
     getHuman,
+    reviews,
 )
 
 episodeEnum = GraphQLEnumType(
@@ -194,8 +200,42 @@
     },
 )
 
+
+async def subscribe_reviews(_root, _info, episode):
+    for review in reviews[episode]:
+        yield review
+        await asyncio.sleep(0.1)
+
+
+async def resolve_review(review, _info, **_args):
+    return review
+
+
+subscriptionType = GraphQLObjectType(
+    "Subscription",
+    fields=lambda: {
+        "reviewAdded": GraphQLField(
+            reviewType,
+            args={
+                "episode": GraphQLArgument(
+                    description="Episode to review", type_=episodeEnum,
+                )
+            },
+            subscribe=subscribe_reviews,
+            resolve=resolve_review,
+        )
+    },
+)
+
+
 StarWarsSchema = GraphQLSchema(
     query=queryType,
     mutation=mutationType,
+    subscription=subscriptionType,
     types=[humanType, droidType, reviewType, reviewInputType],
 )
+
+
+StarWarsIntrospection = graphql_sync(StarWarsSchema, get_introspection_query()).data
+
+StarWarsTypeDef = print_schema(StarWarsSchema)

tests_py36/test_query.py renamed to tests/starwars/test_subscription.py

@@ -2,8 +2,9 @@
 from graphql import subscribe
 
 from gql import gql
-from tests.starwars.fixtures import reviews
-from tests_py36.schema import StarWarsSchema
+
+from .fixtures import reviews
+from .schema import StarWarsSchema
 
 
 @pytest.mark.asyncio

tests/starwars/test_validation.py

@@ -1,11 +1,8 @@
 import pytest
-from graphql import get_introspection_query, graphql_sync
 
 from gql import Client, gql
 
-from .schema import StarWarsSchema
-
-introspection = graphql_sync(StarWarsSchema, get_introspection_query()).data
+from .schema import StarWarsIntrospection, StarWarsSchema
 
 
 @pytest.fixture
@@ -60,7 +57,7 @@ def typedef_schema():
 
 @pytest.fixture
 def introspection_schema():
-    return Client(introspection=introspection)
+    return Client(introspection=StarWarsIntrospection)
 
 
 @pytest.fixture(params=["local_schema", "typedef_schema", "introspection_schema"])

tests_py36/test_aiohttp.py renamed to tests/test_aiohttp.py

@@ -7,9 +7,9 @@
 
 from gql import Client, gql
 from gql.transport.websockets import WebsocketsTransport
-from tests_py36.schema import StarWarsIntrospection, StarWarsSchema, StarWarsTypeDef
 
 from .conftest import MS, TestServer
+from .starwars.schema import StarWarsIntrospection, StarWarsSchema, StarWarsTypeDef
 
 starwars_expected_one = {
     "stars": 3,

tests_py36/test_aiohttp_online.py renamed to tests/test_aiohttp_online.py

@@ -19,7 +19,7 @@ async def test_async_client_async_transport(
     # Get async transport
     sample_transport = AIOHTTPTransport(url=url)
 
-    # Instanciate client
+    # Instantiate client
     async with Client(
         transport=sample_transport,
         fetch_schema_from_transport=fetch_schema_from_transport,