Add tag-based test filtering #8
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| #! /usr/bin/sh | ||
|
|
||
| export PYTHONPATH=$PYTHONPATH:./src | ||
| python3 -m dmtest "$@" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,55 @@ | ||
| import toml | ||
|
|
||
|
|
||
| _CONFIG_KEYS = { | ||
| "metadata_dev": ("devices", None), | ||
| "data_dev": ("devices", None), | ||
| "cache_dev": ("devices", None), | ||
| "disable_by_id_check": ("devices", False), | ||
| "tags": ("filter", None), | ||
| "cache_policy": ("run", "smq"), | ||
| } | ||
|
|
||
|
|
||
| class Config: | ||
| def __init__(self, raw): | ||
| self._raw = raw | ||
|
|
||
| def get(self, key): | ||
| entry = _CONFIG_KEYS.get(key) | ||
| if entry is None: | ||
| raise KeyError(f"unknown config key: {key}") | ||
| section, default = entry | ||
| return self._raw.get(section, {}).get(key, default) | ||
|
|
||
|
|
||
| # Linux reordered my nvme drives once and I ran tests across | ||
| # /boot. This check tries to avoid that. The exception is | ||
| # virt devices, which don't seem to have an id. | ||
| def check_dev(value, name): | ||
| if not ( | ||
| value.startswith("/dev/vd") or value.startswith("/dev/mapper/") | ||
| ) and not value.startswith("/dev/disk/by-id/"): | ||
| raise ValueError(f"config value '{name}' does not begin with /dev/disk/by-id") | ||
|
|
||
|
|
||
| def validate(cfg): | ||
| if "devices" not in cfg._raw: | ||
| raise ValueError( | ||
| "config.toml must have a [devices] section; " | ||
| "see config.toml.example for the expected format" | ||
| ) | ||
| for key in ("metadata_dev", "data_dev"): | ||
| if cfg.get(key) is None: | ||
| raise ValueError(f"config.toml: missing required key '{key}' in [devices]") | ||
| if not cfg.get("disable_by_id_check"): | ||
| check_dev(cfg.get("metadata_dev"), "metadata_dev") | ||
|
Collaborator
There was a problem hiding this comment. check_dev here really doesn't operation on anything except the config, so it probably makes more sense as a function in the Config class. Possibly the entire validate() function should also be defined in the Config class as well, though that makes less difference in terms of code complexity. |
||
| check_dev(cfg.get("data_dev"), "data_dev") | ||
|
|
||
|
|
||
| def read_config(path="config.toml"): | ||
| with open(path, "r") as f: | ||
| raw = toml.load(f) | ||
| cfg = Config(raw) | ||
| validate(cfg) | ||
| return cfg | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's not a big deal, probably but, I'm concerned about what this formatting will look like. tree_line() justifies everything so the test name will take up 50 columns. You're adding another 30 columns, so the results will necessarily show up past column 80 here, which is awkward if you're using an 80-character-wide terminal (like I do).
Another concern is that if there are three or four tags, they may take more than 30 columns to print.
Perhaps you could steal some columns from tree_line? Perhaps you could put the tags after the results columns? Perhaps you could deliberately add a second line for the tags of each test?
(Also tags here is guaranteed to be a frozenset I think, you shouldn't need the if/else.)