Merge pull request #701 from blueyed/fix-tests

tests: skip tests without xdist

Author: blueyed

.travis.yml

@@ -6,7 +6,7 @@ jobs:
   include:
     - stage: baseline
       python: 3.6
-      env: TOXENV=py36-dj20-postgres-coverage
+      env: TOXENV=py36-dj20-postgres-xdist-coverage
       services:
         - postgresql
     - python: 3.6

setup.py

@@ -42,7 +42,6 @@ def read(fname):
         'testing': [
             'Django',
             'django-configurations>=2.0',
-            'pytest-xdist>=1.15',
             'six',
         ],
     },

tests/test_db_setup.py

@@ -115,6 +115,7 @@ def test_a():
 
 
 def test_xdist_with_reuse(django_testdir):
+    pytest.importorskip("xdist")
     skip_if_sqlite_in_memory()
 
     drop_database("gw0")
@@ -192,6 +193,7 @@ class TestSqliteWithXdist:
     }
 
     def test_sqlite_in_memory_used(self, django_testdir):
+        pytest.importorskip("xdist")
 
         django_testdir.create_test_module(
             """

tox.ini

@@ -26,6 +26,7 @@ deps =
     coverage: coverage-enable-subprocess
 
     pytest41: pytest>=4.1,<4.2
+    xdist: pytest-xdist>=1.15
 
 setenv =
     PYTHONPATH = {toxinidir}:{env:PYTHONPATH:}