Test things with pytest too

xmlrunner · Mar 15, 2019 · 112c159 · 112c159
1 parent 4890cd7
commit 112c159
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,6 +18,8 @@ matrix:
       env: TOXENV=py36
     - python: 3.7-dev
       env: TOXENV=py37
+    - python: 3.7
+      env: TOXENV=pytest
     - os: linux
       dist: xenial
       python: pypy2.7-6.0

diff --git a/tox.ini b/tox.ini
@@ -1,20 +1,25 @@
+[pytest]
+python_files = *_test.py test*.py
+testpaths = tests
+norecursedirs = tests/django_example
+
 [tox]
-envlist = begin,py{27,py,py3,34,35,36,37},py27-django{lts,curr},end,quality
+envlist = begin,py{27,py,py3,35,36,37},pytest,py27-django{lts,curr},end,quality
 
 [tox:travis]
 2.7 = begin,py27,py27-django{lts,curr},end,quality
-3.4 = py34
 3.5 = py35
 3.6 = py36
-3.7 = py37
+3.7 = py37,pytest
 
 [testenv]
 deps =
     coverage
     codecov>=1.4.0
     coveralls
-    djangolts: django>=1.8.8,<1.9.0
+    djangolts,pytest: django>=1.8.8,<1.9.0
     djangocurr: django>=1.9.1
+    pytest: pytest
     lxml>=3.6.0
     mock
 commands =
@@ -24,6 +29,9 @@ commands =
     -coveralls
 passenv = CI TRAVIS_BUILD_ID TRAVIS TRAVIS_BRANCH TRAVIS_JOB_NUMBER TRAVIS_PULL_REQUEST TRAVIS_JOB_ID TRAVIS_REPO_SLUG TRAVIS_COMMIT
 
+[testenv:pytest]
+commands = pytest
+
 [testenv:begin]
 commands = coverage erase