Skip to content

Commit 439ff6e

Browse files
committed
In Ubuntu tests, skip RPM related content
Ideally, we should make the failing tests distribution-agnostic. For this moment we can simply skip these tests on systems where RPM isn't installed. Signed-off-by: Craig Andrews <[email protected]>
1 parent a0fd918 commit 439ff6e

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

tests/DS/test_ds_misc.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ sds_add_multiple_twice(){
7777

7878
function test_eval {
7979
probecheck "rpminfo" || return 255
80+
[ -e "/var/lib/rpm" ] || return 255
8081
local stderr=$(mktemp -t ${name}.out.XXXXXX)
8182
$OSCAP xccdf eval "${srcdir}/$1" 2> $stderr
8283
diff /dev/null $stderr; rm $stderr

tests/DS/test_sds_eval.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ set -e -o pipefail
1212

1313
function test_eval {
1414
probecheck "rpminfo" || return 255
15+
[ -e "/var/lib/rpm" ] || return 255
1516
local stderr=$(mktemp -t ${name}.out.XXXXXX)
1617
$OSCAP xccdf eval "${srcdir}/$1" 2> $stderr
1718
diff /dev/null $stderr; rm $stderr

0 commit comments

Comments
 (0)