Skip to content

Commit f35487a

Browse files
Introduced ZSETs for testcases and testcases with component (#327)
1 parent 8424b62 commit f35487a

File tree

5 files changed

+36
-6
lines changed

5 files changed

+36
-6
lines changed

README.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,15 @@ poetry run flake8
104104

105105
### Running tests
106106

107-
A simple test suite is provided, and can be run with:
107+
A test suite is provided, and can be run with:
108108

109109
```sh
110-
$ poetry run pytest
110+
$ tox
111+
```
112+
113+
To run a specific test:
114+
```sh
115+
$ tox -- tests/test_redistimeseries.py
111116
```
112117

113118
## License

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "redisbench-admin"
3-
version = "0.7.21"
3+
version = "0.7.22"
44
description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
55
authors = ["filipecosta90 <filipecosta.90@gmail.com>","Redis Performance Group <performance@redis.com>"]
66
readme = "README.md"

redisbench_admin/run/redistimeseries.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,13 @@ def update_secondary_result_keys(
380380
try:
381381
if test_name is not None:
382382
rts.sadd(testcases_setname, test_name)
383+
testcases_zsetname = testcases_setname + ":zset"
384+
rts.zadd(testcases_zsetname, {test_name: start_time_ms})
385+
if "component" in metadata_tags:
386+
testcases_zsetname_component = "{}:zset:component:{}".format(
387+
testcases_setname, metadata_tags["component"]
388+
)
389+
rts.zadd(testcases_zsetname_component, {test_name: start_time_ms})
383390
if "arch" in metadata_tags:
384391
rts.sadd(project_archs_setname, metadata_tags["arch"])
385392
if "os" in metadata_tags:

redisbench_admin/run_remote/run_remote.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,8 +494,8 @@ def run_remote_command_logic(args, project_name, project_version):
494494
)
495495
if start_profile_result is True:
496496
logging.info(
497-
"Successfully started remote profile for Redis with PID: {}".format(
498-
primary_one_pid
497+
"Successfully started remote profile for Redis with PID: {}. Used call-graph mode {}".format(
498+
primary_one_pid, PERF_CALLGRAPH_MODE
499499
)
500500
)
501501

tests/test_redistimeseries.py

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,32 @@ def test_timeseries_test_sucess_flow():
8888
tf_github_org,
8989
tf_github_repo,
9090
tf_triggering_env,
91-
{"arch": "amd64", "os": "debian:8", "compiler": "gcc"},
91+
{
92+
"arch": "amd64",
93+
"os": "debian:8",
94+
"compiler": "gcc",
95+
"component": "search",
96+
},
9297
"build1",
9398
"platform1",
9499
)
95100

96101
assert rts.exists(testcases_and_metric_context_path_setname)
97102
assert rts.exists(testcases_metric_context_path_setname)
103+
testcases_zsetname = testcases_setname + ":zset"
104+
testcases_zsetname_component_search = (
105+
testcases_setname + ":zset:component:search"
106+
)
98107
assert rts.exists(testcases_setname)
108+
assert rts.exists(testcases_zsetname)
109+
assert rts.zcard(testcases_zsetname)
110+
assert rts.zcard(testcases_zsetname_component_search)
111+
assert test_name.encode() in rts.zpopmin(testcases_zsetname)[0][0]
112+
assert rts.exists(testcases_zsetname_component_search)
113+
assert (
114+
test_name.encode()
115+
in rts.zpopmin(testcases_zsetname_component_search)[0][0]
116+
)
99117
assert rts.exists(running_platforms_setname)
100118
assert rts.exists(build_variant_setname)
101119

0 commit comments

Comments
 (0)