From fb91ba00aed3a5922bfc179bfa98a6d8eb410046 Mon Sep 17 00:00:00 2001 From: Naufan Rizal Date: Fri, 28 Mar 2025 09:33:25 +1100 Subject: [PATCH] Remove CI=true check --- src/buildkite_test_collector/collector/run_env.py | 3 --- .../pytest_plugin/__init__.py | 11 +++-------- .../collector/test_run_env.py | 9 +-------- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/src/buildkite_test_collector/collector/run_env.py b/src/buildkite_test_collector/collector/run_env.py index f91df6e..726ca0c 100644 --- a/src/buildkite_test_collector/collector/run_env.py +++ b/src/buildkite_test_collector/collector/run_env.py @@ -78,9 +78,6 @@ def __circle_ci_env() -> Optional['RuntimeEnvironment']: def __generic_env() -> Optional['RuntimeEnvironment']: - if __get_env("CI") is None: - return None - return RuntimeEnvironment( ci="generic", key=str(uuid4()), diff --git a/src/buildkite_test_collector/pytest_plugin/__init__.py b/src/buildkite_test_collector/pytest_plugin/__init__.py index 7030d3e..5df87ff 100644 --- a/src/buildkite_test_collector/pytest_plugin/__init__.py +++ b/src/buildkite_test_collector/pytest_plugin/__init__.py @@ -26,17 +26,12 @@ def spans(request): def pytest_configure(config): """pytest_configure hook callback""" env = detect_env() - debug = environ.get("BUILDKITE_ANALYTICS_DEBUG_ENABLED") config.addinivalue_line("markers", "execution_tag(key, value): add tag to test execution for Buildkite Test Collector. Both key and value must be a string.") - if env: - plugin = BuildkitePlugin(Payload.init(env)) - setattr(config, '_buildkite', plugin) - config.pluginmanager.register(plugin) - - elif debug: - warning("Unable to detect CI environment. No test analytics will be sent.") + plugin = BuildkitePlugin(Payload.init(env)) + setattr(config, '_buildkite', plugin) + config.pluginmanager.register(plugin) @pytest.hookimpl diff --git a/tests/buildkite_test_collector/collector/test_run_env.py b/tests/buildkite_test_collector/collector/test_run_env.py index 02d715a..84677be 100644 --- a/tests/buildkite_test_collector/collector/test_run_env.py +++ b/tests/buildkite_test_collector/collector/test_run_env.py @@ -7,11 +7,6 @@ from buildkite_test_collector.collector.run_env import detect_env -def test_detect_env_with_no_env_returns_none(): - with mock.patch.dict(os.environ, {}, clear=True): - assert detect_env() is None - - def test_detect_env_with_buildkite_api_env_vars_returns_the_correct_environment(): id = str(uuid4()) commit = uuid4().hex @@ -96,9 +91,7 @@ def test_detect_env_with_circle_ci_env_vars_returns_the_correct_environment(): assert runtime_env.message == "excellent adventure" def test_detect_env_with_generic_env_vars(): - env = { - "CI": "true" - } + env = {} with mock.patch.dict(os.environ, env, clear=True): runtime_env = detect_env()