Skip to content

Fixed multiple TLS tests fail on 2nd test due to tls cert/key filenames being replaced #79

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
merged 2 commits into from
Feb 9, 2022
Merged

Fixed multiple TLS tests fail on 2nd test due to tls cert/key filenames being replaced #79

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3aacfe4
Fixed multiple TLS tests fail on 2nd test due to tls cert/key filenam…
filipecosta90 Feb 9, 2022
9e26f93
Merge branch 'main' into tls.fix
filipecosta90 Feb 9, 2022
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
22 changes: 13 additions & 9 deletions redis_benchmarks_specification/__runner__/runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,13 +260,17 @@ def process_self_contained_coordinator_stream(
if tls_enabled:
metadata["tls"] = "true"
if tls_cert is not None and tls_cert != "":
_, tls_cert = cp_to_workdir(temporary_dir_client, tls_cert)
_, test_tls_cert = cp_to_workdir(
temporary_dir_client, tls_cert
)
if tls_cacert is not None and tls_cacert != "":
_, tls_cacert = cp_to_workdir(
_, test_tls_cacert = cp_to_workdir(
temporary_dir_client, tls_cacert
)
if tls_key is not None and tls_key != "":
_, tls_key = cp_to_workdir(temporary_dir_client, tls_key)
_, test_tls_key = cp_to_workdir(
temporary_dir_client, tls_key
)

if "preload_tool" in benchmark_config["dbconfig"]:
data_prepopulation_step(
Expand All @@ -281,9 +285,9 @@ def process_self_contained_coordinator_stream(
host,
tls_enabled,
tls_skip_verify,
tls_cert,
tls_key,
tls_cacert,
test_tls_cert,
test_tls_key,
test_tls_cacert,
)

benchmark_tool = extract_client_tool(benchmark_config)
Expand Down Expand Up @@ -337,9 +341,9 @@ def process_self_contained_coordinator_stream(
False,
tls_enabled,
tls_skip_verify,
tls_cert,
tls_key,
tls_cacert,
test_tls_cert,
test_tls_key,
test_tls_cacert,
)

client_container_image = extract_client_container_image(
Expand Down