Skip to content

Ensure overriding test vars with env vars works for booleans #727

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

Merged
OddBloke merged 2 commits into from
Dec 15, 2020
Merged

Ensure overriding test vars with env vars works for booleans #727

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b78424b
Ensure overriding test vars with env vars works for booleans and None
TheRealFalcon Dec 14, 2020
f29bcb4
Merge branch 'master' into env-vars
OddBloke Dec 15, 2020
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
10 changes: 9 additions & 1 deletion tests/integration_tests/integration_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# This file is part of cloud-init. See LICENSE file for license information.
import os

from distutils.util import strtobool
Copy link
Copy Markdown
Collaborator

@OddBloke OddBloke Dec 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎶 hello util my old friend 🎶


##################################################################
# LAUNCH SETTINGS
##################################################################
Expand Down Expand Up @@ -109,6 +111,12 @@
# Perhaps a bit too hacky, but it works :)
current_settings = [var for var in locals() if var.isupper()]
for setting in current_settings:
globals()[setting] = os.getenv(
env_setting = os.getenv(
'CLOUD_INIT_{}'.format(setting), globals()[setting]
)
if isinstance(env_setting, str):
try:
env_setting = bool(strtobool(env_setting.strip()))
except ValueError:
pass
globals()[setting] = env_setting