From 7e7d3c4e5ab992f8ba23ac6834b3dcd8cc9f0663 Mon Sep 17 00:00:00 2001 From: Syrus Date: Sun, 26 Jul 2020 20:25:51 -0700 Subject: [PATCH] Integrate async tests into main code --- Makefile | 6 +++--- .../relay/tests/test_connection_async.py | 0 .../relay/tests/test_mutation_async.py | 0 .../types/tests/test_subscribe_async.py | 0 tox.ini | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename tests_asyncio/test_relay_connection.py => graphene/relay/tests/test_connection_async.py (100%) rename tests_asyncio/test_relay_mutation.py => graphene/relay/tests/test_mutation_async.py (100%) rename tests_asyncio/test_subscribe.py => graphene/types/tests/test_subscribe_async.py (100%) diff --git a/Makefile b/Makefile index df3b4118..c78e2b4f 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ install-dev: pip install -e ".[dev]" test: - py.test graphene examples tests_asyncio + py.test graphene examples .PHONY: docs ## Generate docs docs: install-dev @@ -20,8 +20,8 @@ docs-live: install-dev .PHONY: format format: - black graphene examples setup.py tests_asyncio + black graphene examples setup.py .PHONY: lint lint: - flake8 graphene examples setup.py tests_asyncio + flake8 graphene examples setup.py diff --git a/tests_asyncio/test_relay_connection.py b/graphene/relay/tests/test_connection_async.py similarity index 100% rename from tests_asyncio/test_relay_connection.py rename to graphene/relay/tests/test_connection_async.py diff --git a/tests_asyncio/test_relay_mutation.py b/graphene/relay/tests/test_mutation_async.py similarity index 100% rename from tests_asyncio/test_relay_mutation.py rename to graphene/relay/tests/test_mutation_async.py diff --git a/tests_asyncio/test_subscribe.py b/graphene/types/tests/test_subscribe_async.py similarity index 100% rename from tests_asyncio/test_subscribe.py rename to graphene/types/tests/test_subscribe_async.py diff --git a/tox.ini b/tox.ini index 468f5fbc..b0298fea 100644 --- a/tox.ini +++ b/tox.ini @@ -8,7 +8,7 @@ deps = setenv = PYTHONPATH = .:{envdir} commands = - py{36,37}: pytest --cov=graphene graphene examples tests_asyncio {posargs} + py{36,37}: pytest --cov=graphene graphene examples {posargs} [testenv:pre-commit] basepython=python3.7