From 1f4e0dd22ee5b9f894a213ac941792a889a22200 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Sun, 24 Dec 2017 03:01:32 +0100 Subject: [PATCH] Make it possible to explicitly state the version in pytest for different envs --- conftest.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/conftest.py b/conftest.py index a45f1e3d..b12dead4 100644 --- a/conftest.py +++ b/conftest.py @@ -1,7 +1,6 @@ import tempfile import shutil import os -import sys import pytest @@ -38,6 +37,9 @@ def pytest_addoption(parser): parser.addoption("--warning-is-error", action='store_true', help="Warnings are treated as errors.") + parser.addoption("--env", action='store', + help="Execute the tests in that environment (e.g. 35 for python3.5).") + def pytest_configure(config): global jedi_cache_directory_orig, jedi_cache_directory_temp @@ -82,8 +84,12 @@ def clean_jedi_cache(request): @pytest.fixture(scope='session') -def environment(): - version = os.environ.get('JEDI_TEST_ENVIRONMENT', str(py_version)) +def environment(request): + if request is None: + version = os.environ.get('JEDI_TEST_ENVIRONMENT', str(py_version)) + else: + version = request.config.option.env + if int(version) == py_version: return get_default_environment()