Add color output to tests in CI (#15774)

DataDog · Sep 7, 2023 · c758504 · c758504
1 parent 526b71c
commit c758504
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/test-target.yml b/.github/workflows/test-target.yml
@@ -86,6 +86,7 @@ jobs:
     runs-on: ${{ fromJson(inputs.runner) }}
 
     env:
+      FORCE_COLOR: "1"
       PYTHON_VERSION: "${{ inputs.python-version || '3.9' }}"
       PYTHON_FILTER: "${{ (inputs.test-py2 && !inputs.test-py3) && '2.7' || (!inputs.test-py2 && inputs.test-py3) && '3.9' || '' }}"
       SKIP_ENV_NAME: "${{ (inputs.test-py2 && !inputs.test-py3) && 'py3.*' || (!inputs.test-py2 && inputs.test-py3) && 'py2.*' || '' }}"

diff --git a/ddev/CHANGELOG.md b/ddev/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+***Added***:
+
+* Add color output to tests in CI ([#15774](https://github.com/DataDog/integrations-core/pull/15774))
+
 ## 5.0.0 / 2023-09-06
 
 ***Removed***:

diff --git a/ddev/src/ddev/cli/__init__.py b/ddev/src/ddev/cli/__init__.py
@@ -36,7 +36,7 @@
 @click.option(
     '--color/--no-color',
     default=None,
-    help='Whether or not to display colored output (default is auto-detection) [env vars: `DDEV_COLOR`/`NO_COLOR`]',
+    help='Whether or not to display colored output (default is auto-detection) [env vars: `FORCE_COLOR`/`NO_COLOR`]',
 )
 @click.option(
     '--interactive/--no-interactive',

diff --git a/ddev/src/ddev/cli/test/__init__.py b/ddev/src/ddev/cli/test/__init__.py
@@ -103,6 +103,8 @@ def test(
 
         return
 
+    in_ci = running_in_ci()
+
     global_env_vars: dict[str, str] = {}
 
     hatch_verbosity = app.verbosity + 1
@@ -225,7 +227,7 @@ def test(
                 app.display_header('Coverage report')
                 app.platform.check_command([sys.executable, '-m', 'coverage', 'report', '--rcfile=../.coveragerc'])
 
-                if running_in_ci():
+                if in_ci:
                     app.platform.check_command(
                         [sys.executable, '-m', 'coverage', 'xml', '-i', '--rcfile=../.coveragerc']
                     )

diff --git a/ddev/src/ddev/config/constants.py b/ddev/src/ddev/config/constants.py
@@ -8,7 +8,7 @@ class AppEnvVars:
     VERBOSE = 'DDEV_VERBOSE'
     # https://no-color.org
     NO_COLOR = 'NO_COLOR'
-    FORCE_COLOR = 'DDEV_COLOR'
+    FORCE_COLOR = 'FORCE_COLOR'
 
 
 class ConfigEnvVars:

diff --git a/ddev/tests/conftest.py b/ddev/tests/conftest.py
@@ -96,6 +96,7 @@ def valid_integration(valid_integrations) -> str:
 @pytest.fixture(autouse=True)
 def config_file(tmp_path, monkeypatch, local_repo) -> ConfigFile:
     for env_var in (
+        'FORCE_COLOR',
         'DD_ENV',
         'DD_SERVICE',
         'DD_SITE',

diff --git a/ddev/tests/validation/test_tracker.py b/ddev/tests/validation/test_tracker.py
@@ -11,7 +11,7 @@
 
 def get_tracker():
     return ValidationTracker(
-        Console(),
+        Console(no_color=True, legacy_windows=True),
         Tree('validate test', style=Style.parse('bold')),
         success_style=Style.parse('bold cyan'),
         error_style=Style.parse('bold red'),