adamwill / rpms / openscap

Forked from rpms/openscap 3 years ago
Clone
Blob Blame History Raw
From 293a2da756796cba8bcf3d9b7a153e685030594f Mon Sep 17 00:00:00 2001
From: Matus Marhefka <mmarhefk@redhat.com>
Date: Mon, 27 May 2019 10:29:54 +0200
Subject: [PATCH] Add --oval-results to the
 ds_continue_without_remote_resources test

---
 tests/DS/test_ds.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/DS/test_ds.sh b/tests/DS/test_ds.sh
index 1383ad87a..43ea43797 100755
--- a/tests/DS/test_ds.sh
+++ b/tests/DS/test_ds.sh
@@ -418,14 +418,15 @@ function test_ds_continue_without_remote_resources() {
 	local DS="${srcdir}/$1"
 	local PROFILE="$2"
 	local result=$(mktemp)
+	local oval_result="test_single_rule.oval.xml.result.xml"
 
-	$OSCAP xccdf eval --profile "$PROFILE" --results "$result" "$DS"
+	$OSCAP xccdf eval --oval-results --profile "$PROFILE" --results "$result" "$DS"
 
 	assert_exists 1 '//rule-result[@idref="xccdf_com.example.www_rule_test-pass"]/result[text()="pass"]'
 	assert_exists 1 '//rule-result[@idref="xccdf_com.example.www_rule_test-remote_res"]/result[text()="notchecked"]'
 	assert_exists 1 '//rule-result[@idref="xccdf_com.example.www_rule_test-pass2"]/result[text()="pass"]'
 
-	rm -f "$result"
+	rm -f "$result" "$oval_result"
 }