py.test and moving tests out of lib path (tortoise#193)

* Less CI runs on Travis should let it complete faster.
* Cleaned up the root folder
* Tests no longer in the library module path, so a little easier to keep separate.
* Since coveralls broke in handling multiple test runs, at least now the coverage reported will be correct.
* Default to py.test due to a bit more features (e.g. collect warnings, etc) Although performance is notably slower than green, it is still worth it for the extra flexibility.

Author: grigi

.coveragerc

@@ -5,7 +5,6 @@ source =
 omit =
     tortoise/contrib/pylint/*
     tortoise/contrib/test/nose2.py
-    tortoise/tests/*
     tortoise/contrib/quart/*
     tortoise/contrib/sanic/*
     tortoise/contrib/starlette/*

.travis.yml

@@ -5,36 +5,29 @@ python:
   - 3.7
 env:
   global:
-    TORTOISE_TEST_MODULES=tortoise.tests.testmodels
-env:
-  - TORTOISE_TEST_DB="sqlite:///tmp/test-{}.sqlite"
-  - TORTOISE_TEST_DB="postgres://postgres:@127.0.0.1:5432/test_{}"
-  - TORTOISE_TEST_DB="mysql://root:@127.0.0.1:3306/test_{}"
+    TORTOISE_TEST_MODULES=tests.testmodels
 matrix:
   include:
   - python: pypy3.6-7.1.1
-    env: TORTOISE_TEST_DB="sqlite:///tmp/test-{}.sqlite"
-    install: pip install -r requirements-pypy.txt
-    script: green
-  - python: pypy3.6-7.1.1
-    env: TORTOISE_TEST_DB="mysql://root:@127.0.0.1:3306/test_{}"
-    install: pip install -r requirements-pypy.txt
+    install: pip install -r tests/requirements-pypy.txt
+    script: make _testall
+    env: PYTEST_ADDOPTS="--no-cov"
+    after_success: echo
+  - python: 3.7
+    env: TEST_RUNNER=green
     script: green
-  - python: 3.6
-    env: TEST_RUNNER=py.test
-    install: pip install -r requirements-dev.txt
-    script: py.test
-  - python: 3.6
+    after_success: echo
+  - python: 3.7
     env: TEST_RUNNER=nose2
-    install: pip install -r requirements-dev.txt
-    script: "nose2 --plugin tortoise.contrib.test.nose2 --db-module tortoise.tests.testmodels --db-url sqlite://:memory:"
+    script: "nose2 --plugin tortoise.contrib.test.nose2 --db-module tests.testmodels --db-url sqlite://:memory:"
+    after_success: echo
 dist: xenial
 services:
   - postgresql
   - mysql
 cache: pip
 install:
-  - pip install -r requirements-dev.txt
+  - pip install -r tests/requirements.txt
 script:
   - make ci
 after_success:

Makefile

@@ -1,4 +1,4 @@
-checkfiles = tortoise/ examples/ setup.py conftest.py
+checkfiles = tortoise/ examples/ tests/ setup.py conftest.py
 black_opts = -l 100
 py_warn = PYTHONWARNINGS=default PYTHONASYNCIODEBUG=1 PYTHONDEBUG=x PYTHONDEVMODE=dev
 
@@ -16,15 +16,15 @@ help:
 	@echo  "    style       Auto-formats the code"
 
 up:
-	CUSTOM_COMPILE_COMMAND="make up" pip-compile -o requirements-pypy.txt requirements-pypy.in -U
-	CUSTOM_COMPILE_COMMAND="make up" pip-compile -o requirements-dev.txt requirements-dev.in -U
-	cat docs/extra_requirements.txt >> requirements-pypy.txt
-	cat docs/extra_requirements.txt >> requirements-dev.txt
-	sed -i "s/^-e .*/-e ./" requirements-dev.txt
+	cd tests && CUSTOM_COMPILE_COMMAND="make up" pip-compile -o requirements-pypy.txt requirements-pypy.in -U
+	cd tests && CUSTOM_COMPILE_COMMAND="make up" pip-compile -o requirements.txt requirements.in -U
+	cat tests/extra_requirements.txt >> tests/requirements-pypy.txt
+	cat tests/extra_requirements.txt >> tests/requirements.txt
+	sed -i "s/^-e .*/-e ./" tests/requirements.txt
 
 deps:
-	@pip install -q pip-tools
-	@pip-sync requirements-dev.txt
+	@which pip-sync || pip install -q pip-tools
+	@pip-sync tests/requirements.txt
 
 check: deps
 ifneq ($(shell which black),)
@@ -47,20 +47,16 @@ endif
 	python setup.py check -mrs
 
 test: deps
-	coverage erase
-	$(py_warn) coverage run -p --concurrency=multiprocessing `which green`
-	coverage combine
-	coverage report
+	-$(py_warn) TORTOISE_TEST_DB=sqlite://:memory: py.test -q
 
-testall: deps
-	coverage erase
-	-$(py_warn) TORTOISE_TEST_DB=sqlite://:memory: coverage run -p --concurrency=multiprocessing `which green`
-	-$(py_warn) TORTOISE_TEST_DB=postgres://postgres:@127.0.0.1:5432/test_\{\} coverage run -p --concurrency=multiprocessing `which green`
-	-$(py_warn) TORTOISE_TEST_DB="mysql://root:@127.0.0.1:3306/test_\{\}" coverage run -p --concurrency=multiprocessing `which green`
-	coverage combine
-	coverage report
+_testall:
+	-$(py_warn) TORTOISE_TEST_DB=sqlite://:memory: py.test -q --cov-report=
+	-python -V | grep PyPy || $(py_warn) TORTOISE_TEST_DB=postgres://postgres:@127.0.0.1:5432/test_\{\} py.test -q --cov-append --cov-report=
+	-$(py_warn) TORTOISE_TEST_DB="mysql://root:@127.0.0.1:3306/test_\{\}" py.test -q --cov-append
 
-ci: check test
+testall: deps _testall
+
+ci: check testall
 
 docs: deps
 	python setup.py build_sphinx -E

conftest.py

@@ -1,9 +1,12 @@
-from tortoise.contrib.test import finalizer, initializer
+import os
 
+import pytest
 
-def pytest_runtest_setup(item):
-    initializer(["tortoise.tests.testmodels"], db_url="sqlite://:memory:")
+from tortoise.contrib.test import finalizer, initializer
 
 
-def pytest_runtest_teardown(item, nextitem):
-    finalizer()
+@pytest.fixture(scope="session", autouse=True)
+def initialize_tests(request):
+    db_url = os.environ.get("TORTOISE_TEST_DB", "sqlite://:memory:")
+    initializer(["tests.testmodels"], db_url=db_url)
+    request.addfinalizer(finalizer)

requirements-pypy.txt

@@ -17,6 +17,9 @@ no-skip-report= True
 initializer   = tortoise.contrib.test.env_initializer
 finalizer     = tortoise.contrib.test.finalizer
 
+[tool:pytest]
+addopts = -n auto --cov=tortoise
+
 [mypy]
 new_semantic_analyzer = True
 ignore_missing_imports = True
@@ -36,7 +39,7 @@ allow_redefinition = True
 strict_equality = True
 show_error_context = True
 
-[mypy-tortoise.tests.*]
+[mypy-tests.*]
 check_untyped_defs = False
 disallow_untyped_defs = False
 disallow_incomplete_defs = False

setup.cfg

@@ -35,7 +35,7 @@ def requirements() -> list:
     # License
     license="Apache License Version 2.0",
     # Packages
-    packages=find_packages(include=["tortoise*"], exclude=["tortoise.tests"]),
+    packages=find_packages(include=["tortoise*"]),
     zip_safe=True,
     # Include additional files into the package
     include_package_data=True,

setup.py

@@ -1,3 +1,4 @@
 aiocontextvars==0.2.2 ; python_version < "3.7"
 contextvars==2.4 ; python_version < "3.7"
 immutables==0.9 ; python_version < "3.7"
+pathlib2==2.3.4 ; python_version < "3.6"

tortoise/tests/__init__.py tests/__init__.py

@@ -1,6 +1,6 @@
+from tests import testmodels
 from tortoise.contrib import test
 from tortoise.exceptions import IntegrityError
-from tortoise.tests import testmodels
 
 
 class TestBooleanFields(test.TestCase):

docs/extra_requirements.txt tests/extra_requirements.txt

@@ -1,7 +1,7 @@
+from tests import testmodels
 from tortoise import fields
 from tortoise.contrib import test
 from tortoise.exceptions import ConfigurationError, IntegrityError
-from tortoise.tests import testmodels
 
 
 class TestCharFields(test.TestCase):

tortoise/tests/fields/__init__.py tests/fields/__init__.py

@@ -1,9 +1,9 @@
 from decimal import Decimal
 
+from tests import testmodels
 from tortoise import fields
 from tortoise.contrib import test
 from tortoise.exceptions import ConfigurationError, IntegrityError
-from tortoise.tests import testmodels
 
 
 class TestDecimalFields(test.TestCase):

tortoise/tests/fields/test_bool.py tests/fields/test_bool.py

@@ -1,6 +1,6 @@
+from tests import testmodels
 from tortoise.contrib import test
 from tortoise.exceptions import IntegrityError, NoValuesFetched, OperationalError
-from tortoise.tests import testmodels
 
 
 class TestForeignKeyField(test.TestCase):

tortoise/tests/fields/test_char.py tests/fields/test_char.py

@@ -1,6 +1,6 @@
+from tests import testmodels
 from tortoise.contrib import test
 from tortoise.exceptions import IntegrityError, NoValuesFetched, OperationalError
-from tortoise.tests import testmodels
 
 
 class TestForeignKeyUUIDField(test.TestCase):

tortoise/tests/fields/test_common.py tests/fields/test_common.py

@@ -1,8 +1,8 @@
 from decimal import Decimal
 
+from tests import testmodels
 from tortoise.contrib import test
 from tortoise.exceptions import IntegrityError
-from tortoise.tests import testmodels
 
 
 class TestFloatFields(test.TestCase):

tortoise/tests/fields/test_decimal.py tests/fields/test_decimal.py

@@ -1,6 +1,6 @@
+from tests import testmodels
 from tortoise.contrib import test
 from tortoise.exceptions import IntegrityError
-from tortoise.tests import testmodels
 
 
 class TestIntFields(test.TestCase):

tortoise/tests/fields/test_fk.py tests/fields/test_fk.py

@@ -1,6 +1,6 @@
+from tests import testmodels
 from tortoise.contrib import test
 from tortoise.exceptions import IntegrityError
-from tortoise.tests import testmodels
 
 
 class TestJSONFields(test.TestCase):

tortoise/tests/fields/test_fk_uuid.py tests/fields/test_fk_uuid.py

@@ -1,6 +1,6 @@
+from tests import testmodels
 from tortoise.contrib import test
 from tortoise.exceptions import OperationalError
-from tortoise.tests import testmodels
 
 
 class TestManyToManyField(test.TestCase):

tortoise/tests/fields/test_float.py tests/fields/test_float.py

@@ -1,6 +1,6 @@
+from tests import testmodels
 from tortoise.contrib import test
 from tortoise.exceptions import OperationalError
-from tortoise.tests import testmodels
 
 
 class TestManyToManyUUIDField(test.TestCase):

tortoise/tests/fields/test_int.py tests/fields/test_int.py

@@ -1,10 +1,10 @@
 from datetime import date, datetime, timedelta
 from time import sleep
 
+from tests import testmodels
 from tortoise import fields
 from tortoise.contrib import test
 from tortoise.exceptions import ConfigurationError, IntegrityError
-from tortoise.tests import testmodels
 
 
 class TestDatetimeFields(test.TestCase):

tortoise/tests/fields/test_json.py tests/fields/test_json.py

@@ -1,8 +1,8 @@
 import uuid
 
+from tests import testmodels
 from tortoise.contrib import test
 from tortoise.exceptions import IntegrityError
-from tortoise.tests import testmodels
 
 
 class TestUUIDFields(test.TestCase):

tortoise/tests/fields/test_m2m.py tests/fields/test_m2m.py

@@ -10,7 +10,7 @@
     "apps": {
         "models": {
             "models": [
-                "tortoise.tests.testmodels"
+                "tests.testmodels"
             ],
             "default_connection": "default"
         }

tortoise/tests/fields/test_m2m_uuid.py tests/fields/test_m2m_uuid.py

@@ -2,7 +2,7 @@ apps:
   models:
     default_connection: default
     models:
-      - tortoise.tests.testmodels
+      - tests.testmodels
 connections:
   default:
     credentials:

tortoise/tests/fields/test_time.py tests/fields/test_time.py

@@ -1,4 +1,4 @@
--r requirements.txt
+-r ../requirements.txt
 
 # Optional dependencies
 pyyaml>=4.2b1
@@ -10,4 +10,7 @@ aiomysql
 
 ## Test tools
 asynctest
-green
+pytest
+pytest-xdist
+pytest-cov
+coveralls

tortoise/tests/fields/test_uuid.py tests/fields/test_uuid.py

@@ -0,0 +1,46 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    make up
+#
+aiomysql==0.0.20
+aiosqlite==0.10.0
+apipkg==1.5               # via execnet
+asn1crypto==0.24.0        # via cryptography
+asynctest==0.13.0
+atomicwrites==1.3.0       # via pytest
+attrs==19.1.0             # via pytest
+certifi==2019.9.11        # via requests
+cffi==1.12.3              # via cryptography
+chardet==3.0.4            # via requests
+ciso8601==2.1.1
+coverage==4.5.4           # via coveralls, pytest-cov
+coveralls==1.8.2
+cryptography==2.7         # via pymysql
+docopt==0.6.2             # via coveralls
+execnet==1.7.1            # via pytest-xdist
+idna==2.8                 # via requests
+importlib-metadata==0.23  # via pluggy, pytest
+more-itertools==7.2.0     # via pytest, zipp
+packaging==19.2           # via pytest
+pluggy==0.13.0            # via pytest
+py==1.8.0                 # via pytest
+pycparser==2.19           # via cffi
+pymysql==0.9.2            # via aiomysql
+pyparsing==2.4.2          # via packaging
+pypika==0.35.5
+pytest-cov==2.7.1
+pytest-forked==1.0.2      # via pytest-xdist
+pytest-xdist==1.29.0
+pytest==5.1.3
+pyyaml==5.1.2
+requests==2.22.0          # via coveralls
+six==1.12.0               # via cryptography, packaging, pytest-xdist
+urllib3==1.25.5           # via requests
+wcwidth==0.1.7            # via pytest
+zipp==0.6.0               # via importlib-metadata
+aiocontextvars==0.2.2 ; python_version < "3.7"
+contextvars==2.4 ; python_version < "3.7"
+immutables==0.9 ; python_version < "3.7"
+pathlib2==2.3.4 ; python_version < "3.6"