Skip to content

Commit

Permalink
Adjust tests checking for the dnf command output
Browse files Browse the repository at this point in the history
The default Fedora container image has been updated to `fedora:41`
which uses `dnf5`. Modify tests which are checking for the `dnf`
output. Fix a minor typo.
  • Loading branch information
psss committed Oct 31, 2024
1 parent 777d8a7 commit f775125
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion tests/execute/framework/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ rlJournalStart
rlAssertGrep "Execute '/tests/shell/explicit' as a 'shell' test." $rlRun_LOG
rlAssertGrep "Execute '/tests/beakerlib' as a 'beakerlib' test." $rlRun_LOG
# Beakerlib dependency should be detected from framework
rlAssertGrep "dnf install.*beakerlib" $rlRun_LOG
rlAssertGrep "dnf.* install.*beakerlib" $rlRun_LOG
rlPhaseEnd

rlPhaseStartCleanup
Expand Down
3 changes: 1 addition & 2 deletions tests/try/basic/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ rlJournalStart
rlPhaseStartTest "Install"
rlRun -s "./install.exp"
rlAssertGrep "Let's try.*/plans/basic" $rlRun_LOG
rlAssertGrep "cmd: rpm -q --whatprovides tree || dnf install -y tree" $rlRun_LOG
rlAssertGrep "out: Installed:" $rlRun_LOG
rlAssertGrep "cmd: rpm -q --whatprovides tree || dnf.* install -y tree" $rlRun_LOG
rlAssertGrep "Run .* successfully finished. Bye for now!" $rlRun_LOG
rlPhaseEnd

Expand Down
2 changes: 1 addition & 1 deletion tmt/steps/prepare/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def go(
# guests. For example, a test running on the "server" guest might
# require package `foo` while the test running on the "client" might
# require package `bar`, and `foo` and `bar` cannot be installed at the
# sametime.
# same time.


@dataclasses.dataclass
Expand Down

0 comments on commit f775125

Please sign in to comment.