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

Jump to bottom

test(profiling): unset DD_SITE variable in agentless URL check [backport 1.17] #6644

Merged
merged 2 commits into from
Aug 11, 2023
Merged

test(profiling): unset DD_SITE variable in agentless URL check [backport 1.17] #6644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a2809f
test(profiling): unset DD_SITE variable in agentless URL check (#6642)
P403n1x87 Aug 11, 2023
3931401
Merge branch '1.17' into backport-6642-to-1.17
mabdinur Aug 11, 2023
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
8 changes: 7 additions & 1 deletion tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,13 @@ def run_function_from_file(item, params=None):
pythonpath = os.getenv("PYTHONPATH", None)
base_path = os.path.dirname(os.path.dirname(__file__))
env["PYTHONPATH"] = os.pathsep.join((base_path, pythonpath)) if pythonpath is not None else base_path
env.update(marker.kwargs.get("env", {}))

for key, value in marker.kwargs.get("env", {}).items():
if value is None: # None means remove the variable
env.pop(key, None)
else:
env[key] = value

if params is not None:
env.update(params)

Expand Down
2 changes: 1 addition & 1 deletion tests/profiling/test_profiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ def test_disable_memory():


@pytest.mark.subprocess(
env=dict(DD_PROFILING_AGENTLESS="true", DD_API_KEY="foobar"),
env=dict(DD_PROFILING_AGENTLESS="true", DD_API_KEY="foobar", DD_SITE=None),
err=None,
)
def test_env_agentless():
Expand Down
Loading