Improve isolation in race control tests #1172
Merged
Conversation
This file contains 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
With this commit we rely on pytest fixtures for proper cleanup even when a test case fails. Previously, cleanup was only working when a test succeeded leading to unwanted side-effects between tests.
danielmitterdorfer
added
enhancement
dliappis
approved these changes
Feb 4, 2021
tests/racecontrol_test.py
Outdated
| with pytest.raises(exceptions.SystemSetupError) as ex: | ||
| racecontrol.run(cfg) | ||
|
|
||
| assert re.match(r"Unknown pipeline \[invalid]. List the available pipelines with [\S]+? list pipelines.", |
There was a problem hiding this comment.
We could also use the modern feature match feature of pytest and simply:
with pytest.raises(
exceptions.SystemSetupError,
match=r"Unknown pipeline \[invalid]. List the available pipelines with [\S]+? list pipelines."):
racecontrol.run(cfg)
thus removing the need to use a named resource for the exception and a separate assert (and more importantly having to know which property of the exception object holds the message :) )
There was a problem hiding this comment.
Nice, thanks for the improvement! I've pushed this in dff0ee0.
tests/racecontrol_test.py
Outdated
| racecontrol.run(cfg) | ||
|
|
||
| mock_pipeline.assert_called_once_with(cfg) | ||
| assert ex.value.message == "Only the [benchmark-only] pipeline is supported by the Rally Docker image.\n" \ |
There was a problem hiding this comment.
Same suggestion as above, for leveraging match, and using re.escape() since this is a literal match i.e.
with pytest.raises(
exceptions.SystemSetupError,
match=re.escape(
"Only the [benchmark-only] pipeline is supported by the Rally Docker image.\n"
"Add --pipeline=benchmark-only in your Rally arguments and try again.\n"
"For more details read the docs for the benchmark-only pipeline in "
"https://esrally.readthedocs.io/en/latest/pipelines.html#benchmark-only\n"
)):
racecontrol.run(cfg)
There was a problem hiding this comment.
Nice, thanks for the improvement! I've pushed this in dff0ee0.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
With this commit we rely on pytest fixtures for proper cleanup even when
a test case fails. Previously, cleanup was only working when a test
succeeded leading to unwanted side-effects between tests.