adamwill / rpms / openscap

Forked from rpms/openscap 3 years ago
Clone
fa2dd6
From 293a2da756796cba8bcf3d9b7a153e685030594f Mon Sep 17 00:00:00 2001
fa2dd6
From: Matus Marhefka <mmarhefk@redhat.com>
fa2dd6
Date: Mon, 27 May 2019 10:29:54 +0200
fa2dd6
Subject: [PATCH] Add --oval-results to the
fa2dd6
 ds_continue_without_remote_resources test
fa2dd6
fa2dd6
---
fa2dd6
 tests/DS/test_ds.sh | 5 +++--
fa2dd6
 1 file changed, 3 insertions(+), 2 deletions(-)
fa2dd6
fa2dd6
diff --git a/tests/DS/test_ds.sh b/tests/DS/test_ds.sh
fa2dd6
index 1383ad87a..43ea43797 100755
fa2dd6
--- a/tests/DS/test_ds.sh
fa2dd6
+++ b/tests/DS/test_ds.sh
fa2dd6
@@ -418,14 +418,15 @@ function test_ds_continue_without_remote_resources() {
fa2dd6
 	local DS="${srcdir}/$1"
fa2dd6
 	local PROFILE="$2"
fa2dd6
 	local result=$(mktemp)
fa2dd6
+	local oval_result="test_single_rule.oval.xml.result.xml"
fa2dd6
 
fa2dd6
-	$OSCAP xccdf eval --profile "$PROFILE" --results "$result" "$DS"
fa2dd6
+	$OSCAP xccdf eval --oval-results --profile "$PROFILE" --results "$result" "$DS"
fa2dd6
 
fa2dd6
 	assert_exists 1 '//rule-result[@idref="xccdf_com.example.www_rule_test-pass"]/result[text()="pass"]'
fa2dd6
 	assert_exists 1 '//rule-result[@idref="xccdf_com.example.www_rule_test-remote_res"]/result[text()="notchecked"]'
fa2dd6
 	assert_exists 1 '//rule-result[@idref="xccdf_com.example.www_rule_test-pass2"]/result[text()="pass"]'
fa2dd6
 
fa2dd6
-	rm -f "$result"
fa2dd6
+	rm -f "$result" "$oval_result"
fa2dd6
 }
fa2dd6
 
fa2dd6