Merge pull request #271 from blueyed/pp

tests: set PYTHONPATH via session scoped fixture

Author: ionelmc

setup.cfg

@@ -3,7 +3,6 @@ universal = 1
 
 [flake8]
 max-line-length = 140
-exclude = tests/*,*/migrations/*,*/south_migrations/*
 
 [tool:pytest]
 testpaths = tests

tests/test_pytest_cov.py

@@ -156,6 +156,23 @@ def test_foo(cov):
 ], ids=['nodist', 'xdist'])
 
 
+@pytest.fixture(scope='session', autouse=True)
+def adjust_sys_path():
+    """Adjust PYTHONPATH during tests to make "helper" importable in SCRIPT."""
+    orig_path = os.environ.get('PYTHONPATH', None)
+    new_path = os.path.dirname(__file__)
+    if orig_path is not None:
+        new_path = os.pathsep.join([new_path, orig_path])
+    os.environ['PYTHONPATH'] = new_path
+
+    yield
+
+    if orig_path is None:
+        del os.environ['PYTHONPATH']
+    else:
+        os.environ['PYTHONPATH'] = orig_path
+
+
 @pytest.fixture(params=[
     ('branch=true', '--cov-branch', '9 * 85%', '3 * 100%'),
     ('branch=true', '',             '9 * 85%', '3 * 100%'),
@@ -454,7 +471,8 @@ def test_subprocess_with_path_aliasing(testdir, monkeypatch):
 parallel = true
 """)
 
-    monkeypatch.setitem(os.environ, 'PYTHONPATH', os.pathsep.join([os.environ.get('PYTHONPATH',''), 'aliased']))
+    monkeypatch.setitem(os.environ, 'PYTHONPATH', os.pathsep.join([
+        os.environ.get('PYTHONPATH', ''), 'aliased']))
     result = testdir.runpytest('-v',
                                '--cov',
                                '--cov-report=term-missing',

tox.ini

@@ -18,7 +18,6 @@ basepython =
     py37: {env:TOXPYTHON:python3.7}
     {clean,check,report,extension-coveralls,coveralls,spell}: python3.4
 setenv =
-    PYTHONPATH={toxinidir}/tests
     PYTHONUNBUFFERED=yes
 passenv =
     *