Skip to content

Commit c5611c7

Browse files
Fixes tests after memtier password args (#187)
1 parent 1ae9e26 commit c5611c7

File tree

5 files changed

+21
-16
lines changed

5 files changed

+21
-16
lines changed

redis_benchmarks_specification/__common__/runner.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ def execute_init_commands(benchmark_config, r, dbconfig_keyname="dbconfig"):
1414
cmds = None
1515
res = 0
1616
if dbconfig_keyname in benchmark_config:
17-
# print(benchmark_config[dbconfig_keyname])
18-
# print(type(benchmark_config[dbconfig_keyname]))
1917
for k, v in benchmark_config[dbconfig_keyname].items():
2018
if "init_commands" in k:
2119
cmds = v
@@ -25,7 +23,6 @@ def execute_init_commands(benchmark_config, r, dbconfig_keyname="dbconfig"):
2523
if cmds is not None:
2624
for cmd in cmds:
2725
is_array = False
28-
print(type(cmd))
2926
if type(cmd) == list:
3027
is_array = True
3128
if '"' in cmd:

utils/tests/test_data/test-suites/memtier_benchmark-1Mkeys-100B-expire-use-case-with-variant.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dbconfig:
66
configuration-parameters:
77
save: '""'
88
check:
9-
keyspacelen: 1
9+
keyspacelen: 0
1010
preload_tool:
1111
run_image: redislabs/memtier_benchmark:edge
1212
tool: memtier_benchmark

utils/tests/test_data/test-suites/memtier_benchmark-1Mkeys-100B-expire-use-case.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dbconfig:
66
configuration-parameters:
77
save: '""'
88
check:
9-
keyspacelen: 1
9+
keyspacelen: 0
1010
preload_tool:
1111
run_image: redislabs/memtier_benchmark:edge
1212
tool: memtier_benchmark

utils/tests/test_data/test-suites/memtier_benchmark-2keys-stream-5-entries-xread-all-entries.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ dbconfig:
55
configuration-parameters:
66
save: '""'
77
check:
8-
keyspacelen: 1
8+
keyspacelen: 2
99
resources:
1010
requests:
1111
memory: 1g
1212
init_commands:
13-
xadd key-1 * field value
14-
xadd key-1 * field value
15-
xadd key-1 * field value
16-
xadd key-1 * field value
17-
xadd key-1 * field value
18-
xadd key-2 * field value
19-
xadd key-2 * field value
20-
xadd key-2 * field value
21-
xadd key-2 * field value
22-
xadd key-2 * field value
13+
- xadd key-1 * field value
14+
- xadd key-1 * field value
15+
- xadd key-1 * field value
16+
- xadd key-1 * field value
17+
- xadd key-1 * field value
18+
- xadd key-2 * field value
19+
- xadd key-2 * field value
20+
- xadd key-2 * field value
21+
- xadd key-2 * field value
22+
- xadd key-2 * field value
2323
tested-commands:
2424
- xread
2525
redis-topologies:

utils/tests/test_runner.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ def test_prepare_memtier_benchmark_parameters():
2828
client_tool,
2929
12000,
3030
"localhost",
31+
None,
3132
local_benchmark_output_filename,
3233
oss_api_enabled,
3334
)
@@ -40,6 +41,7 @@ def test_prepare_memtier_benchmark_parameters():
4041
client_tool,
4142
12000,
4243
"localhost",
44+
None,
4345
local_benchmark_output_filename,
4446
oss_api_enabled,
4547
False,
@@ -60,6 +62,7 @@ def test_prepare_memtier_benchmark_parameters():
6062
client_tool,
6163
12000,
6264
"localhost",
65+
None,
6366
local_benchmark_output_filename,
6467
oss_api_enabled,
6568
)
@@ -80,6 +83,7 @@ def test_prepare_memtier_benchmark_parameters():
8083
client_tool,
8184
12000,
8285
"localhost",
86+
None,
8387
local_benchmark_output_filename,
8488
oss_api_enabled,
8589
tls_enabled,
@@ -98,6 +102,7 @@ def test_prepare_memtier_benchmark_parameters():
98102
client_tool,
99103
12000,
100104
"localhost",
105+
None,
101106
local_benchmark_output_filename,
102107
oss_api_enabled,
103108
tls_enabled,
@@ -116,6 +121,7 @@ def test_prepare_memtier_benchmark_parameters():
116121
client_tool,
117122
12000,
118123
"localhost",
124+
None,
119125
local_benchmark_output_filename,
120126
oss_api_enabled,
121127
tls_enabled,
@@ -136,6 +142,7 @@ def test_prepare_memtier_benchmark_parameters():
136142
client_tool,
137143
12000,
138144
"localhost",
145+
None,
139146
local_benchmark_output_filename,
140147
oss_api_enabled,
141148
tls_enabled,
@@ -154,6 +161,7 @@ def test_prepare_memtier_benchmark_parameters():
154161
client_tool,
155162
12000,
156163
"localhost",
164+
None,
157165
local_benchmark_output_filename,
158166
oss_api_enabled,
159167
tls_enabled,

0 commit comments

Comments
 (0)