Merge pull request #1066 from nejch/chore/pytest-for-unit-tests

max-wittig · web-flow · commit efc618237850 · 2020-04-08T08:20:43.000+02:00
chore: use pytest to run unit tests and coverage
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,14 @@
 *.pyc
 build/
 dist/
+htmlcov/
 MANIFEST
 .*.swp
 *.egg-info
 .idea/
+coverage.xml
 docs/_build
-.testrepository/
+.coverage
 .tox
+.venv/
 venv/
diff --git a/.testr.conf b/.testr.conf
diff --git a/.travis.yml b/.travis.yml
@@ -83,5 +83,12 @@ jobs:
       script:
         - pip3 install tox
         - tox -e py38
+    - stage: test
+      dist: bionic
+      name: coverage
+      python: 3.8
+      script:
+        - pip3 install tox
+        - tox -e cover
   allow_failures:
     - env: GITLAB_TAG=nightly
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,5 @@
 include COPYING AUTHORS ChangeLog.rst RELEASE_NOTES.rst requirements.txt test-requirements.txt rtd-requirements.txt
-include tox.ini .testr.conf .travis.yml
+include tox.ini .travis.yml
 recursive-include tools *
 recursive-include docs *j2 *.py *.rst api/*.rst Makefile make.bat
 recursive-include gitlab/tests/data *
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -1,9 +1,9 @@
 coverage
-discover
-testrepository
 hacking>=0.9.2,<0.10
 httmock
 jinja2
 mock
+pytest
+pytest-cov
 sphinx>=1.3
 sphinx_rtd_theme
diff --git a/tox.ini b/tox.ini
@@ -13,7 +13,7 @@ install_command = pip install {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands =
-  python setup.py testr --testr-args='{posargs}'
+  pytest gitlab/tests {posargs}
 
 [testenv:pep8]
 commands =
@@ -40,9 +40,11 @@ commands = python setup.py build_sphinx
 
 [testenv:cover]
 commands =
-   python setup.py testr --slowest --coverage --testr-args="{posargs}"
-   coverage report --omit=*tests*
-   coverage html --omit=*tests*
+  pytest --cov gitlab --cov-report term --cov-report html \
+    --cov-report xml gitlab/tests {posargs}
+
+[coverage:run]
+omit = *tests*
 
 [testenv:cli_func_v4]
 commands = {toxinidir}/tools/functional_tests.sh -a 4
