Speed up test suites by using a single virtual environment per Python…

… version (DataDog#6789) * Speed up test suites by using a single virtual environment per Python version * workaround tox bug tox-dev/tox#1593 * test all integrations * fix * great * address
FlorianVeaux · Jun 3, 2020 · 27e7f30 · 27e7f30
1 parent 50f3bc2
commit 27e7f30
Show file tree

Hide file tree

Showing 139 changed files with 552 additions and 2 deletions.
diff --git a/active_directory/tox.ini b/active_directory/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = win32

diff --git a/activemq/tox.ini b/activemq/tox.ini
@@ -6,6 +6,9 @@ envlist =
     py38
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py38: {toxworkdir}/py38
 description =
     py38: e2e ready
 usedevelop = true

diff --git a/activemq_xml/tox.ini b/activemq_xml/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 usedevelop = true

diff --git a/aerospike/tox.ini b/aerospike/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}-{latest}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true

diff --git a/airflow/tox.ini b/airflow/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
    py{27,38}: e2e ready
 dd_check_style = true

diff --git a/amazon_msk/tox.ini b/amazon_msk/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = linux|darwin|win32

diff --git a/ambari/tox.ini b/ambari/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = linux|darwin|win32

diff --git a/apache/tox.ini b/apache/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 usedevelop = true

diff --git a/aspdotnet/tox.ini b/aspdotnet/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = win32

diff --git a/btrfs/tox.ini b/btrfs/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 usedevelop = true
 dd_check_style = true
 platform = linux|darwin

diff --git a/cacti/tox.ini b/cacti/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 usedevelop = true

diff --git a/cassandra/tox.ini b/cassandra/tox.ini
@@ -6,6 +6,9 @@ envlist =
     py38
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py38: {toxworkdir}/py38
 description =
     py38: e2e ready
 usedevelop = true

diff --git a/cassandra_nodetool/tox.ini b/cassandra_nodetool/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{2.1,3.0}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true

diff --git a/ceph/tox.ini b/ceph/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true

diff --git a/cilium/tox.ini b/cilium/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready

diff --git a/cisco_aci/tox.ini b/cisco_aci/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 usedevelop = true
 dd_check_style = true
 deps =

diff --git a/clickhouse/tox.ini b/clickhouse/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}-{18,19,latest}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}: e2e ready

diff --git a/cockroachdb/tox.ini b/cockroachdb/tox.ini
@@ -7,6 +7,10 @@ envlist =
     bench
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true

diff --git a/confluent_platform/tox.ini b/confluent_platform/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py38: e2e ready
 dd_check_style = true

diff --git a/consul/tox.ini b/consul/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{0.6.4,0.7.2,1.0.0,1.0.6}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true

diff --git a/coredns/tox.ini b/coredns/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{1.2.0}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 description =
     py{27,38}-{1.2.0}: e2e ready 

diff --git a/couch/tox.ini b/couch/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{1.6,2.3}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true

diff --git a/couchbase/tox.ini b/couchbase/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}-{5.5.3}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true

diff --git a/crio/tox.ini b/crio/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = linux|darwin|win32

diff --git a/datadog_checks_base/tox.ini b/datadog_checks_base/tox.ini
@@ -6,6 +6,10 @@ envlist =
     bench
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 dd_check_types = true
 dd_mypy_args =

diff --git a/datadog_checks_dev/datadog_checks/dev/plugin/tox.py b/datadog_checks_dev/datadog_checks/dev/plugin/tox.py
@@ -14,6 +14,7 @@
 TYPES_FLAG = 'dd_check_types'
 MYPY_ARGS_OPTION = 'dd_mypy_args'
 E2E_READY_CONDITION = 'e2e ready if'
+FIX_DEFAULT_ENVDIR_FLAG = 'ensure_default_envdir'
 
 
 @tox.hookimpl
@@ -23,11 +24,12 @@ def tox_configure(config):
     For an example, see: https://github.com/tox-dev/tox-travis
     """
     sections = config._cfg.sections
+    base_testenv = sections.get('testenv', {})
 
     # Default to false so:
     # 1. we don't affect other projects using tox
     # 2. check migrations can happen gradually
-    if str(sections.get('testenv', {}).get(STYLE_FLAG, 'false')).lower() == 'true':
+    if str(base_testenv.get(STYLE_FLAG, 'false')).lower() == 'true':
         # Disable flake8 since we already include that
         config.envlist[:] = [env for env in config.envlist if not env.endswith('flake8')]
 
@@ -37,8 +39,16 @@ def tox_configure(config):
         add_style_checker(config, sections, make_envconfig, reader)
         add_style_formatter(config, sections, make_envconfig, reader)
 
+    # Workaround for https://github.com/tox-dev/tox/issues/1593
+    #
+    # Do this only after all dynamic environments have been created
+    if str(base_testenv.get(FIX_DEFAULT_ENVDIR_FLAG, 'false')).lower() == 'true':
+        for env_name, env_config in config.envconfigs.items():
+            if env_config.envdir == config.toxinidir:
+                env_config.envdir = config.toxworkdir / env_name
+
     # Conditionally set 'e2e ready' depending on env variables
-    description = sections.get('testenv', {}).get('description')
+    description = base_testenv.get('description')
     if description and E2E_READY_CONDITION in description:
         data, var = description.split(' if ')
         if var in os.environ:

diff --git a/...og_checks_dev/datadog_checks/dev/tooling/templates/integration/check/{check_name}/tox.ini b/...og_checks_dev/datadog_checks/dev/tooling/templates/integration/check/{check_name}/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{{27,38}}
 
 [testenv]
+ensure_correct_envdir = true
+envdir =
+    py27: {{toxworkdir}}/py27
+    py38: {{toxworkdir}}/py38
 dd_check_style = true
 usedevelop = true
 platform = linux|darwin|win32

diff --git a/datadog_checks_dev/tox.ini b/datadog_checks_dev/tox.ini
@@ -6,6 +6,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 dd_check_types = true
 dd_mypy_args =

diff --git a/datadog_checks_downloader/tox.ini b/datadog_checks_downloader/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 deps =

diff --git a/directory/tox.ini b/directory/tox.ini
@@ -7,6 +7,10 @@ envlist =
     bench
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description=
     py{27,38}: e2e ready
 dd_check_style = true

diff --git a/disk/tox.ini b/disk/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description =
     py{27,38}: e2e ready
 dd_check_style = true

diff --git a/dns_check/tox.ini b/dns_check/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 description=
     py{27,38}: e2e ready
 dd_check_style = true

diff --git a/dotnetclr/tox.ini b/dotnetclr/tox.ini
@@ -5,6 +5,10 @@ envlist =
     py{27,38}
 
 [testenv]
+ensure_default_envdir = true
+envdir =
+    py27: {toxworkdir}/py27
+    py38: {toxworkdir}/py38
 dd_check_style = true
 usedevelop = true
 platform = win32