Update tests to pass smoothly when running against recent Fedora
This commit is contained in:
parent
9028f52643
commit
4c1eb64467
3 changed files with 26 additions and 3 deletions
|
|
@ -41,12 +41,20 @@ rlJournalStart
|
|||
|
||||
rlPhaseStartTest "#3: strings -n 0"
|
||||
rlRun "strings -n 0 2>&1 | tee output"
|
||||
rlAssertGrep "invalid minimum string length 0" output
|
||||
if rlIsFedora "> 39"; then
|
||||
rlAssertGrep "minimum string length is too small: 0" output
|
||||
else
|
||||
rlAssertGrep "invalid minimum string length 0" output
|
||||
fi
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest "#4: strings --bytes 0"
|
||||
rlRun "strings --bytes 0 2>&1 | tee output"
|
||||
rlAssertGrep "invalid minimum string length 0" output
|
||||
if rlIsFedora "> 39"; then
|
||||
rlAssertGrep "minimum string length is too small: 0" output
|
||||
else
|
||||
rlAssertGrep "invalid minimum string length 0" output
|
||||
fi
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartCleanup
|
||||
|
|
|
|||
|
|
@ -7,3 +7,16 @@ tag+:
|
|||
|
||||
require+:
|
||||
- wget
|
||||
|
||||
environment+:
|
||||
WGET_PACKAGE: "wget"
|
||||
REQUIRES: "wget"
|
||||
|
||||
adjust+:
|
||||
- when: distro >= fedora-39
|
||||
require+:
|
||||
- wget2
|
||||
|
||||
environment+:
|
||||
WGET_PACKAGE: "wget2"
|
||||
REQUIRES: "wget2"
|
||||
|
|
|
|||
|
|
@ -35,9 +35,11 @@ rlJournalStart
|
|||
rlPhaseStartSetup
|
||||
buTestHeader
|
||||
|
||||
rlLogInfo "WGET_PACKAGE=$WGET_PACKAGE"
|
||||
|
||||
buEnterTmpDir
|
||||
|
||||
buPrepareSRPM "wget"
|
||||
buPrepareSRPM "$WGET_PACKAGE"
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue