From 4f9cb312f4fa37bb2ac52791419d7dd7fb6b7ea0 Mon Sep 17 00:00:00 2001 From: David Kirov Date: Thu, 30 Jan 2025 15:29:29 +0100 Subject: [PATCH] Add debug function for windows --- .github/workflows/fips-test.yml | 2 +- .github/workflows/fips/tests/conftest.py | 9 +++++++++ .github/workflows/fips/tests/test_connections.py | 4 +++- .github/workflows/fips/tests/test_libraries.py | 5 ++++- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.github/workflows/fips-test.yml b/.github/workflows/fips-test.yml index 7162f4c418af2..1694e03f0ac29 100644 --- a/.github/workflows/fips-test.yml +++ b/.github/workflows/fips-test.yml @@ -66,5 +66,5 @@ jobs: - name: Run tests run: | - pytest -vv .github/workflows/fips/tests + pytest -s -vv .github/workflows/fips/tests diff --git a/.github/workflows/fips/tests/conftest.py b/.github/workflows/fips/tests/conftest.py index fd5d84068f026..124cad5fe7baa 100644 --- a/.github/workflows/fips/tests/conftest.py +++ b/.github/workflows/fips/tests/conftest.py @@ -21,3 +21,12 @@ def parse_json(payload): return parsed_json +def debug(): + env_vars = [ + "GOFIPS", + "OPENSSL_CONF", + "OPENSSL_MODULES", + ] + for var in env_vars: + print(f"{var}: {os.getenv(var)}") + diff --git a/.github/workflows/fips/tests/test_connections.py b/.github/workflows/fips/tests/test_connections.py index d40972fc3a35f..974aa90a93042 100644 --- a/.github/workflows/fips/tests/test_connections.py +++ b/.github/workflows/fips/tests/test_connections.py @@ -1,4 +1,3 @@ -import json import subprocess from conftest import AGENT_FIPS_MODE, parse_json @@ -18,4 +17,7 @@ def test_connections(): parsed_json = parse_json(result.stdout) expected_json = FIPS_AGENT if AGENT_FIPS_MODE else REGULAR_AGENT + from conftest import debug + debug() + assert parsed_json == expected_json diff --git a/.github/workflows/fips/tests/test_libraries.py b/.github/workflows/fips/tests/test_libraries.py index 25d9e548dd47c..2ba842e57b46a 100644 --- a/.github/workflows/fips/tests/test_libraries.py +++ b/.github/workflows/fips/tests/test_libraries.py @@ -13,8 +13,11 @@ def test_libraries(): - result = subprocess.run(["docker", "exec", "-e", "OPENSSL_CONF=/opt/datadog-agent/embedded/ssl/openssl.cnf", "-e", "OPENSSL_MODULES=/opt/datadog-agent/embedded/lib/ossl-modules", "compose-agent-1", "agent", "check", "libraries", "--json"], check=True, capture_output=True) + result = subprocess.run(["docker", "exec", "compose-agent-1", "agent", "check", "libraries", "--json"], check=True, capture_output=True) parsed_json = parse_json(result.stdout) expected_json = FIPS_AGENT if AGENT_FIPS_MODE else REGULAR_AGENT + from conftest import debug + debug() + assert parsed_json == expected_json