From dcce9629a221e7e716599b991678ddbad093b0ce Mon Sep 17 00:00:00 2001 From: dhoomakethu Date: Fri, 20 Apr 2018 14:59:31 +0530 Subject: [PATCH] Replace nosetest with pytest --- Makefile | 2 +- requirements-tests.txt | 2 ++ setup.cfg | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7022b2807..43d6e43ae 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ check: install test: install @pip install --quiet --requirement=requirements-tests.txt - @nosetests --with-coverage --cover-html + @py.test @coverage report --fail-under=90 tox: install diff --git a/requirements-tests.txt b/requirements-tests.txt index 5c4639d1b..044b5a879 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -9,6 +9,8 @@ zope.interface>=4.4.0 pyasn1>=0.2.3 pycrypto>=2.6.1 pyserial>=3.4 +pytest-cov>=2.5.1 +pytest>=3.5.0 redis>=2.10.5 sqlalchemy>=1.1.15 #wsgiref>=0.1.2 diff --git a/setup.cfg b/setup.cfg index 219c63c5d..9e8519e74 100644 --- a/setup.cfg +++ b/setup.cfg @@ -26,4 +26,8 @@ all_files = 1 upload-dir = build/sphinx/html [bdist_wheel] -universal=1 \ No newline at end of file +universal=1 + +[tool:pytest] +addopts = --cov=pymodbus/ +testpaths = test \ No newline at end of file