Skip to content

Commit 8908240

Browse files
Fixed multiple TLS tests fail on 2nd test due to tls cert/key filenames being replaced (#79)
1 parent 414cf8e commit 8908240

File tree

1 file changed

+13
-9
lines changed
  • redis_benchmarks_specification/__runner__

1 file changed

+13
-9
lines changed

redis_benchmarks_specification/__runner__/runner.py

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -260,13 +260,17 @@ def process_self_contained_coordinator_stream(
260260
if tls_enabled:
261261
metadata["tls"] = "true"
262262
if tls_cert is not None and tls_cert != "":
263-
_, tls_cert = cp_to_workdir(temporary_dir_client, tls_cert)
263+
_, test_tls_cert = cp_to_workdir(
264+
temporary_dir_client, tls_cert
265+
)
264266
if tls_cacert is not None and tls_cacert != "":
265-
_, tls_cacert = cp_to_workdir(
267+
_, test_tls_cacert = cp_to_workdir(
266268
temporary_dir_client, tls_cacert
267269
)
268270
if tls_key is not None and tls_key != "":
269-
_, tls_key = cp_to_workdir(temporary_dir_client, tls_key)
271+
_, test_tls_key = cp_to_workdir(
272+
temporary_dir_client, tls_key
273+
)
270274

271275
if "preload_tool" in benchmark_config["dbconfig"]:
272276
data_prepopulation_step(
@@ -281,9 +285,9 @@ def process_self_contained_coordinator_stream(
281285
host,
282286
tls_enabled,
283287
tls_skip_verify,
284-
tls_cert,
285-
tls_key,
286-
tls_cacert,
288+
test_tls_cert,
289+
test_tls_key,
290+
test_tls_cacert,
287291
)
288292

289293
benchmark_tool = extract_client_tool(benchmark_config)
@@ -337,9 +341,9 @@ def process_self_contained_coordinator_stream(
337341
False,
338342
tls_enabled,
339343
tls_skip_verify,
340-
tls_cert,
341-
tls_key,
342-
tls_cacert,
344+
test_tls_cert,
345+
test_tls_key,
346+
test_tls_cacert,
343347
)
344348

345349
client_container_image = extract_client_container_image(

0 commit comments

Comments
 (0)