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.

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

Add an override for the rally homedir #945

Merged
merged 2 commits into from
Apr 1, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
4 changes: 3 additions & 1 deletion it/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,9 @@ def copy_config(name):
with open(f.target_path, "w", encoding="UTF-8") as target:
with open(f.source_path, "r", encoding="UTF-8") as src:
contents = src.read()
target.write(Template(contents).substitute(USER_HOME=f.user_home))
# optionally allow for a homedir override in integration tests
user_home = os.getenv("OVERRIDE_RALLY_HOME", f.user_home)
target.write(Template(contents).substitute(USER_HOME=user_home))

for n in CONFIG_NAMES:
copy_config(n)
Expand Down
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ passenv =
JAVA12_HOME
JAVA13_HOME
SSH_AUTH_SOCK
OVERRIDE_RALLY_HOME
Copy link
Contributor

Choose a reason for hiding this comment

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

maybe in alphanum order here?

# we do not pass LANG and LC_ALL anymore in order to isolate integration tests
# from the test environment. Rally needs to enforce UTF-8 encoding in every
# place so we intentionally set LC_ALL to C.
Expand Down