Add coverage for improved countme system age (dnf 4)#1512
Merged
jan-kolarik merged 5 commits intorpm-software-management:dnf-4-stackfrom Jun 12, 2024
Merged
Add coverage for improved countme system age (dnf 4)#1512jan-kolarik merged 5 commits intorpm-software-management:dnf-4-stackfrom
jan-kolarik merged 5 commits intorpm-software-management:dnf-4-stackfrom
Conversation
Make sure *no* countme flag is present.
Also adapt the HTTP matching patterns in the countme feature file accordingly. This will be used in the next commit, no functional change right now.
Shuffle some steps around, add blank lines and also emphasize that we're dealing with *calendar* weeks/months (i.e. aligned with the calendar, not with the first countme hit). No functional change.
We'll need this step in a "when" context in the next commit. No functional change.
dmnks
changed the title
Member
|
@dmnks I've re-run the tests after the PR actually being merged, but the countme scenarios are failing there. Could you please take a look? |
Contributor
Author
|
Hmm, that's weird, will have a closer look later today. Thanks! |
Contributor
Author
|
OK, this is a test issue. The failing scenario makes the "+3 days" step fall into a new "countme week", probably due to timezone differences. I'm looking into it now. |
Contributor
Author
|
Should be fixed now. I've pushed some of these as "fixup" commits so you can see the changes but feel free to squash them before merging the PR (or let me know and I'll squash them). |
Adapt the countme feature to the libdnf fix for issue rpm-software-management#1611, namely: - Turn the main scenario into a scenario outline to capture the various machine-id(5) configurations (see the table). - Add an upgrade scenario (from F39 to F40) that verifies that system age is now independent of $releasever on systems with a machine-id file. - Use NO_FAKE_STAT=1 in faketime invocations so that filesystem timestamps are *not* reported relative to the target time (this would break our custom machine-id timestamps we set here), see faketime(1) for details. - Add a new MachineId class to encapsulate the machine-id file, similar to OSRelease. - Mark the touched scenarios as destructive (due to them overriding the machine-id file).
Contributor
Author
|
Nevermind, I've squashed them now 😄 It's now ready to be merged as is. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Tests for rpm-software-management/libdnf#1662.
Rebased from #1501.