e2e: Eliminate unneeded nesting #1634
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
We had nested loops, creating a sub test for the workload, and then
nesting more sub tests for every deployer. This causes the go test
framework to add "#N" suffix to the sub test name, which make the name
unpredictable and harder to use for running specific tests using the
-run option.
Simplify the way we generated sub tests, so we generate one sub test for
every deployer-workload combination. The sub test name is is the same
name we used for the test namespace and all resources, making it easier
to follow and more consistent.
Because we use deployer-workload format, and not workload-deployer,
switch the loops to match the name format.
Example run showing the new structure:
--- PASS: TestSuites (0.06s)
--- PASS: TestSuites/Validate (0.06s)
--- PASS: TestSuites/Validate/CheckRamenHubOperatorStatus (0.03s)
--- PASS: TestSuites/Validate/CheckRamenSpokeOperatorStatus (0.03s)
--- PASS: TestSuites/Exhaustive (6.04s)
--- SKIP: TestSuites/Exhaustive/disapp-deploy-cephfs-busybox (0.00s)
--- PASS: TestSuites/Exhaustive/subscr-deploy-cephfs-busybox (431.67s)
--- PASS: TestSuites/Exhaustive/subscr-deploy-cephfs-busybox/Deploy (5.16s)
--- PASS: TestSuites/Exhaustive/subscr-deploy-cephfs-busybox/Enable (155.16s)
--- PASS: TestSuites/Exhaustive/subscr-deploy-cephfs-busybox/Failover (85.08s)
--- PASS: TestSuites/Exhaustive/subscr-deploy-cephfs-busybox/Relocate (150.14s)
--- PASS: TestSuites/Exhaustive/subscr-deploy-cephfs-busybox/Disable (30.03s)
--- PASS: TestSuites/Exhaustive/subscr-deploy-cephfs-busybox/Undeploy (6.10s)
--- PASS: TestSuites/Exhaustive/subscr-deploy-rbd-busybox (461.77s)
--- PASS: TestSuites/Exhaustive/subscr-deploy-rbd-busybox/Deploy (5.17s)
--- PASS: TestSuites/Exhaustive/subscr-deploy-rbd-busybox/Enable (90.24s)
--- PASS: TestSuites/Exhaustive/subscr-deploy-rbd-busybox/Failover (180.15s)
--- PASS: TestSuites/Exhaustive/subscr-deploy-rbd-busybox/Relocate (150.14s)
--- PASS: TestSuites/Exhaustive/subscr-deploy-rbd-busybox/Disable (30.03s)
--- PASS: TestSuites/Exhaustive/subscr-deploy-rbd-busybox/Undeploy (6.05s)
--- PASS: TestSuites/Exhaustive/disapp-deploy-rbd-busybox (496.64s)
--- PASS: TestSuites/Exhaustive/disapp-deploy-rbd-busybox/Deploy (1.39s)
--- PASS: TestSuites/Exhaustive/disapp-deploy-rbd-busybox/Enable (90.11s)
--- PASS: TestSuites/Exhaustive/disapp-deploy-rbd-busybox/Failover (179.97s)
--- PASS: TestSuites/Exhaustive/disapp-deploy-rbd-busybox/Relocate (179.87s)
--- PASS: TestSuites/Exhaustive/disapp-deploy-rbd-busybox/Disable (30.05s)
--- PASS: TestSuites/Exhaustive/disapp-deploy-rbd-busybox/Undeploy (15.24s)
--- PASS: TestSuites/Exhaustive/appset-deploy-cephfs-busybox (600.76s)
--- PASS: TestSuites/Exhaustive/appset-deploy-cephfs-busybox/Deploy (0.16s)
--- PASS: TestSuites/Exhaustive/appset-deploy-cephfs-busybox/Enable (150.18s)
--- PASS: TestSuites/Exhaustive/appset-deploy-cephfs-busybox/Failover (180.16s)
--- PASS: TestSuites/Exhaustive/appset-deploy-cephfs-busybox/Relocate (240.21s)
--- PASS: TestSuites/Exhaustive/appset-deploy-cephfs-busybox/Disable (30.03s)
--- PASS: TestSuites/Exhaustive/appset-deploy-cephfs-busybox/Undeploy (0.02s)
--- PASS: TestSuites/Exhaustive/appset-deploy-rbd-busybox (696.19s)
--- PASS: TestSuites/Exhaustive/appset-deploy-rbd-busybox/Deploy (0.16s)
--- PASS: TestSuites/Exhaustive/appset-deploy-rbd-busybox/Enable (95.34s)
--- PASS: TestSuites/Exhaustive/appset-deploy-rbd-busybox/Failover (300.39s)
--- PASS: TestSuites/Exhaustive/appset-deploy-rbd-busybox/Relocate (270.26s)
--- PASS: TestSuites/Exhaustive/appset-deploy-rbd-busybox/Disable (30.03s)
--- PASS: TestSuites/Exhaustive/appset-deploy-rbd-busybox/Undeploy (0.02s)
With this change we can run any single test using:
./run.sh -run TestSuites/Exhaustive/appset-deploy-cephfs-busybox
We can also run multiple tests, for example all tests using
applicationsets:
./run.sh -run TestSuites/Exhaustive/appset
Or all tests using rbd storage:
./run.sh -run TestSuites/Exhaustive/rbd
Based on Talur's PR RamenDR#1606, which has also other unrelated changes.
Fixes: RamenDR#1614
Signed-off-by: Nir Soffer <[email protected]>
raghavendra-talur
approved these changes
Nov 4, 2024
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.
We had nested loops, creating a sub test for the workload, and then nesting more sub tests for every deployer. This causes the go test framework to add "#N" suffix to the sub test name, which make the name unpredictable and harder to use for running specific tests using the -run option.
Simplify the way we generated sub tests, so we generate one sub test for every deployer-workload combination. The sub test name is is the same name we used for the test namespace and all resources, making it easier to follow and more consistent.
Because we use deployer-workload format, and not workload-deployer, switch the loops to match the name format.
Example run showing the new structure:
With this change we can run any single test using:
We can also run multiple tests, for example all tests using applicationsets:
Or all tests using rbd storage:
Based on Talur's PR #1606, which has also other unrelated changes.
Fixes: #1614