Skip to content

Commit

Permalink
Introduced ZSETs for testcases and testcases with component (#327)
Browse files Browse the repository at this point in the history
  • Loading branch information
filipecosta90 authored Mar 18, 2022
1 parent 8424b62 commit f35487a
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 6 deletions.
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,15 @@ poetry run flake8

### Running tests

A simple test suite is provided, and can be run with:
A test suite is provided, and can be run with:

```sh
$ poetry run pytest
$ tox
```

To run a specific test:
```sh
$ tox -- tests/test_redistimeseries.py
```

## License
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "redisbench-admin"
version = "0.7.21"
version = "0.7.22"
description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
authors = ["filipecosta90 <filipecosta.90@gmail.com>","Redis Performance Group <performance@redis.com>"]
readme = "README.md"
Expand Down
7 changes: 7 additions & 0 deletions redisbench_admin/run/redistimeseries.py
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,13 @@ def update_secondary_result_keys(
try:
if test_name is not None:
rts.sadd(testcases_setname, test_name)
testcases_zsetname = testcases_setname + ":zset"
rts.zadd(testcases_zsetname, {test_name: start_time_ms})
if "component" in metadata_tags:
testcases_zsetname_component = "{}:zset:component:{}".format(
testcases_setname, metadata_tags["component"]
)
rts.zadd(testcases_zsetname_component, {test_name: start_time_ms})
if "arch" in metadata_tags:
rts.sadd(project_archs_setname, metadata_tags["arch"])
if "os" in metadata_tags:
Expand Down
4 changes: 2 additions & 2 deletions redisbench_admin/run_remote/run_remote.py
Original file line number Diff line number Diff line change
Expand Up @@ -494,8 +494,8 @@ def run_remote_command_logic(args, project_name, project_version):
)
if start_profile_result is True:
logging.info(
"Successfully started remote profile for Redis with PID: {}".format(
primary_one_pid
"Successfully started remote profile for Redis with PID: {}. Used call-graph mode {}".format(
primary_one_pid, PERF_CALLGRAPH_MODE
)
)

Expand Down
20 changes: 19 additions & 1 deletion tests/test_redistimeseries.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,32 @@ def test_timeseries_test_sucess_flow():
tf_github_org,
tf_github_repo,
tf_triggering_env,
{"arch": "amd64", "os": "debian:8", "compiler": "gcc"},
{
"arch": "amd64",
"os": "debian:8",
"compiler": "gcc",
"component": "search",
},
"build1",
"platform1",
)

assert rts.exists(testcases_and_metric_context_path_setname)
assert rts.exists(testcases_metric_context_path_setname)
testcases_zsetname = testcases_setname + ":zset"
testcases_zsetname_component_search = (
testcases_setname + ":zset:component:search"
)
assert rts.exists(testcases_setname)
assert rts.exists(testcases_zsetname)
assert rts.zcard(testcases_zsetname)
assert rts.zcard(testcases_zsetname_component_search)
assert test_name.encode() in rts.zpopmin(testcases_zsetname)[0][0]
assert rts.exists(testcases_zsetname_component_search)
assert (
test_name.encode()
in rts.zpopmin(testcases_zsetname_component_search)[0][0]
)
assert rts.exists(running_platforms_setname)
assert rts.exists(build_variant_setname)

Expand Down

0 comments on commit f35487a

Please sign in to comment.