From fdd405f55288e8408014628f6062d766b424ecde Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Sun, 24 Dec 2017 03:47:35 +0100 Subject: [PATCH] The environment selection had a bug --- conftest.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/conftest.py b/conftest.py index b12dead4..59b630c1 100644 --- a/conftest.py +++ b/conftest.py @@ -85,10 +85,9 @@ def clean_jedi_cache(request): @pytest.fixture(scope='session') def environment(request): - if request is None: + version = request.config.option.env + if version 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()