Skip to content
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.

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

Dev kmr #408

Merged
merged 4 commits into from
Sep 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/unittest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: unittest

on:
pull_request:
branches: [ main ]
branches: [ master ]
paths-ignore:
- LICENSE
- '**.md'
Expand Down
2 changes: 1 addition & 1 deletion util/blockbreaker.py
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ def main():
case default:
if args.config == "mv-params":
input_json = get_mv_params(input_json, args.benchmark)
# mv-params, tool-params, passthru-args
# mv-params, tool-params
output = dump_json(input_json, args.config, args.index)

print(output)
Expand Down
1 change: 0 additions & 1 deletion util/tests/JSON/output-oslat-passthru-args.stream

This file was deleted.

1 change: 1 addition & 0 deletions util/tests/JSON/output-oslat-run-params.stream
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--num-samples 1 --test-order s
8 changes: 4 additions & 4 deletions util/tests/test-blockbreaker.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ def test_json_to_stream_tags(self, load_json_file):
"""Test if json_to_stream converts run-params block to a stream"""
@pytest.mark.parametrize("load_json_file",
[ "input-oslat-k8s.json" ], indirect=True)
def test_json_to_stream_run_parameters(self, load_json_file):
run_parameters_stream = blockbreaker.dump_json(load_json_file, "run-params", 0)
expected_stream = self._load_file("output-oslat-passthru-args.stream")
def test_json_to_stream_run_params(self, load_json_file):
run_params_stream = blockbreaker.json_to_stream(load_json_file, "run-params", 0)
expected_stream = self._load_file("output-oslat-run-params.stream")

assert run_parameters_stream == expected_stream
assert run_params_stream == expected_stream

"""Test if dump_json returns a str"""
@pytest.mark.parametrize("load_json_file",
Expand Down