diff --git a/Makefile b/Makefile index 1c486f0..ac7c4b3 100644 --- a/Makefile +++ b/Makefile @@ -5,4 +5,4 @@ clean: @find . -name "__pycache__" -type d | xargs rm -rf test: clean - @python runtests.py --with-coverage + @pytest --cov=cattp diff --git a/conftest.py b/conftest.py new file mode 100644 index 0000000..cd1dc99 --- /dev/null +++ b/conftest.py @@ -0,0 +1,13 @@ +from django.conf import settings +settings.configure( + DATABASES={'default': {'ENGINE': 'django.db.backends.sqlite3'}}, + TEMPLATES=[{ + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'APP_DIRS': True, + }], + AES_ENCRIPTION_KEY='abcdefgh01234567', + INSTALLED_APPS=[ + 'django.contrib.contenttypes', + 'django.contrib.auth', + ], +) diff --git a/requirements-dev.txt b/requirements-dev.txt index 741274d..f20c86b 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,9 @@ -r requirements.txt -coverage==4.3.4 -django-nose==1.4.5 -mock==2.0.0 \ No newline at end of file +codecov==2.0.9 +coverage>=4.4 +flake8==3.4.1 +mock==2.0.0 +pytest>=3.9.1 +pytest-cov>=2.6.0 +pytest-django>=3.4.3 diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_dumb.py b/tests/test_dumb.py new file mode 100644 index 0000000..6620f7b --- /dev/null +++ b/tests/test_dumb.py @@ -0,0 +1,2 @@ +def test_dumb(): + assert 1 == 1