tests: simplify initialisation and wiring #10653
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
github-actions
bot
added
contributor-experience
fricklerhandwerk
force-pushed
the
simplify-test-init
branch
2 times, most recently
from
c6881f1 to
f0f979b
Compare
Ericson2314
reviewed
May 6, 2024
Comment on lines
-90
to
+97
| install_test_init=tests/functional/init.sh | ||
| $(foreach test, $(install-tests), \ | ||
| $(eval $(call run-test,$(test),$(install_test_init))) \ | ||
| $(eval $(call run-test,$(test))) \ | ||
| $(eval installcheck: $(test).test)) | ||
| $(foreach test-group, $(install-tests-groups), \ | ||
| $(eval $(call run-test-group,$(test-group),$(install_test_init))) \ | ||
| $(eval $(call run-test-group,$(test-group))) \ | ||
| $(eval installcheck: $(test-group).test-group) \ | ||
| $(foreach test, $($(test-group)-tests), \ | ||
| $(eval $(call run-test,$(test),$(install_test_init))) \ | ||
| $(eval $(call run-test,$(test))) \ |
There was a problem hiding this comment.
Very good! this was a layer violation
Ericson2314
approved these changes
May 6, 2024
fricklerhandwerk
commented
May 6, 2024
fricklerhandwerk
force-pushed
the
simplify-test-init
branch
2 times, most recently
from
ab52cba to
00285da
Compare
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/2024-05-06-nix-team-meeting-minutes-143/45021/1 |
fricklerhandwerk
force-pushed
the
simplify-test-init
branch
6 times, most recently
from
3dd505b to
2cdc07f
Compare
pararameterisation is not actually needed the way things are currently set up, and it confused me when trying to understand what the code does. all but one test sources vars-and-functions.sh, which nominally only defines variables, but in practice is always coupled with the actual initialisation. while the cleaner way of making this more legible would be to source variables and initialisation separately, this would produce a huge diff. the change requires a few small fixes to keep the tests working: - only create test home directory during initialisation that vars-and-functions.sh wrote to the file system seems not write - fix creation of the test directory due to statefulness, the test home directory was implicitly creating the test root, too. decoupling that made it apparent that this was probably not intentional, and certainly confusing. - only source vars-and-functions.sh if init.sh is not needed there is one test case that only needs a helper function but no initialisation side effects - remove some unnecessary cleanups and split parts of re-used test code there were confusing bits in how initialisation code was repurposed, which break if trying to refactor the outer layers naively...
previously the test directory could have been left untouched before executing a test when `init.sh` was not run - and sometimes it isn't supposed to be run - which made the test suite highly stateful and thus behaving surprisingly on multiple runs.
fricklerhandwerk
force-pushed
the
simplify-test-init
branch
from
c3ccacc to
391c7da
Compare
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/2024-05-13-nix-team-meeting-minutes-145/45437/1 |
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.
pararameterisation is not actually needed the way things are currently set up, and it confused me when trying to understand what the code does.
all but one test sources vars-and-functions.sh, which nominally only defines variables, but in practice is always coupled with the actual initialisation. while the cleaner way of making this more legible would be to source variables and initialisation separately, this would produce a huge diff.
Slowly working towards #9066
Priorities and Process
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.