Merge pull request #854 from pv/test-env-type

Add test option to select which 'default' environment to use

Author: pv

.appveyor.yml

@@ -36,7 +36,7 @@ build_script:
   - python setup.py build_ext -i
 
 test_script:
-  - python -m pytest -l --basetemp=%APPVEYOR_BUILD_FOLDER%\\tmp -n 2 -v -v --webdriver=FirefoxHeadless --timeout=1800 --durations=100 test
+  - python -m pytest -l --basetemp=%APPVEYOR_BUILD_FOLDER%\\tmp -n 2 -v -v --environment-type=conda --webdriver=FirefoxHeadless --timeout=1800 --durations=100 test
 
 after_build:
   # Clear up pip cache

.travis.yml

@@ -65,6 +65,7 @@ install:
     export TRAVIS_PYTHON=`which python`
     export TRAVIS_PIP=`which pip`
     if [[ $USE_CONDA == true ]]; then
+      ENVIRONMENT_TYPE=conda
       mkdir -p $HOME/download;
       export MINICONDA_SH="Miniconda3-latest-Linux-x86_64.sh";
       pushd $HOME/download;
@@ -78,6 +79,7 @@ install:
       conda info
       if $TRAVIS_PYTHON -c 'import virtualenv'; then echo "ERROR: virtualenv package is installed"; exit 1; fi;
     else
+      ENVIRONMENT_TYPE=virtualenv
       if $TRAVIS_PYTHON -c 'import sys; sys.exit(0 if "__pypy__" in sys.modules else 1)'; then
         $TRAVIS_PIP install virtualenv;
       elif [[ "$TRAVIS_PYTHON_VERSION" == "3.8-dev" ]]; then
@@ -91,7 +93,7 @@ install:
   - $TRAVIS_PYTHON setup.py build_ext -i
 
 script:
-  - $TRAVIS_PYTHON -m pytest -l $COVERAGE -n 3 -v -v --webdriver=FirefoxHeadless --timeout=1800 --timeout-method=thread --durations=100 test
+  - $TRAVIS_PYTHON -m pytest -l $COVERAGE -n 3 -v -v --environment-type=$ENVIRONMENT_TYPE --webdriver=FirefoxHeadless --timeout=1800 --timeout-method=thread --durations=100 test
 
 after_script:
   - if [[ "$COVERAGE" != '' ]]; then

asv/environment.py

@@ -434,7 +434,7 @@ def get_environment_class(conf, python):
         classes.insert(0, cls)
 
     for cls in classes:
-        if cls.matches(python):
+        if cls.matches_python_fallback and cls.matches(python):
             return cls
     raise EnvironmentUnavailable(
         "No way to create environment for python='{0}'".format(python))
@@ -469,6 +469,7 @@ class Environment(object):
     project.
     """
     tool_name = None
+    matches_python_fallback = True
 
     def __init__(self, conf, python, requirements, tagged_env_vars):
         """

test/conftest.py

@@ -1,5 +1,6 @@
 import os
 import contextlib
+import pytest
 
 
 def pytest_addoption(parser):
@@ -10,11 +11,23 @@ def pytest_addoption(parser):
                            "with a return statement with selenium.webdriver object, for "
                            "example 'return Chrome()'"))
 
+    parser.addoption("--environment-type", action="store", default=None,
+                     choices=("conda", "virtualenv"),
+                     help="environment_type to use in tests by default")
+
 
 def pytest_sessionstart(session):
     os.environ['PIP_NO_INDEX'] = '1'
     _monkeypatch_conda_lock(session.config)
 
+    # Unregister unwanted environment types
+    env_type = session.config.getoption('environment_type')
+    if env_type is not None:
+        import asv.environment, asv.util
+
+        for cls in asv.util.iter_subclasses(asv.environment.Environment):
+            cls.matches_python_fallback = (cls.tool_name in (env_type, "existing"))
+
 
 def _monkeypatch_conda_lock(config):
     import asv.plugins.conda

test/test_continuous.py

@@ -10,18 +10,16 @@
 from asv.results import iter_results_for_machine
 
 from . import tools
-from .tools import HAS_CONDA
-from .tools import dummy_packages
+from .tools import dummy_packages, get_default_environment_type
 from .test_workflow import basic_conf
 
 
 def test_continuous(capfd, basic_conf):
     tmpdir, local, conf, machine_file = basic_conf
 
-    if HAS_CONDA:
-        env_spec = ("-E", "conda:{0[0]}.{0[1]}".format(sys.version_info))
-    else:
-        env_spec = ("-E", "virtualenv:{0[0]}.{0[1]}".format(sys.version_info))
+    python = "{0[0]}.{0[1]}".format(sys.version_info)
+    env_type = get_default_environment_type(conf, python)
+    env_spec = ("-E", env_type + ":" + python)
 
     # Check that asv continuous runs
     tools.run_asv_with_conf(conf, 'continuous', "master^", '--show-stderr',

test/test_run.py

@@ -20,7 +20,7 @@
 from asv.commands.run import Run
 
 from . import tools
-from .tools import dummy_packages, HAS_CONDA
+from .tools import dummy_packages
 from .test_workflow import basic_conf, generate_basic_conf
 
 

test/test_workflow.py

@@ -22,7 +22,7 @@
 from asv.util import check_output, which
 
 from . import tools
-from .tools import dummy_packages, HAS_CONDA
+from .tools import dummy_packages, get_default_environment_type
 
 
 dummy_values = [
@@ -150,10 +150,9 @@ def test_run_publish(capfd, basic_conf):
     assert 'Running benchmarks.' not in text
 
     # Check EXISTING and --environment work
-    if HAS_CONDA:
-        env_spec = ("-E", "conda:{0[0]}.{0[1]}".format(sys.version_info))
-    else:
-        env_spec = ("-E", "virtualenv:{0[0]}.{0[1]}".format(sys.version_info))
+    python = "{0[0]}.{0[1]}".format(sys.version_info)
+    env_type = get_default_environment_type(conf, python)
+    env_spec = ("-E", env_type + ":" + python)
     tools.run_asv_with_conf(conf, 'run', "EXISTING", '--quick',
                             '--bench=time_secondary.track_value',
                             *env_spec,

test/tools.py

@@ -35,6 +35,7 @@
 from asv import util
 from asv import commands
 from asv import config
+from asv import environment
 from asv import runner
 from asv.commands.preview import create_httpd
 from asv.repo import get_repo
@@ -99,6 +100,10 @@
 from lockfile import LockFile
 
 
+def get_default_environment_type(conf, python):
+    return environment.get_environment_class(conf, python).tool_name
+
+
 @contextmanager
 def locked_cache_dir(config, cache_key, timeout=900, tag=None):
     base_dir = config.cache.makedir(cache_key)