Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove CI env var requirement #46

Merged
merged 1 commit into from
Mar 28, 2025
Merged

Remove CI env var requirement #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/buildkite_test_collector/collector/run_env.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
Expand Down
11 changes: 3 additions & 8 deletions src/buildkite_test_collector/pytest_plugin/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 1 addition & 8 deletions tests/buildkite_test_collector/collector/test_run_env.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down