adamwill / rpms / openscap

Forked from rpms/openscap 3 years ago
Clone

Blame SOURCES/fix_invalid_oval_in_test.patch

fa2dd6
From 919170300b1d05a807ad59c22ef6c4ab48c2f1c9 Mon Sep 17 00:00:00 2001
fa2dd6
From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>
fa2dd6
Date: Tue, 21 May 2019 13:21:45 +0200
fa2dd6
Subject: [PATCH] Fix invalid OVAL in test ds_continue_without_remote_resources
fa2dd6
fa2dd6
Addressing:
fa2dd6
$ oscap ds sds-split remote_content_1.2.ds.xml /tmp/xxx
fa2dd6
$ oscap oval validate --schematron /tmp/xxx/test_single_rule.oval.xml
fa2dd6
fa2dd6
oval:x:obj:1 - referenced variable oval:x:var:1 not found. The var_ref entity must hold a variable id that exists in the document.
fa2dd6
---
fa2dd6
 .../remote_content_1.2.ds.xml                              | 7 +++++++
fa2dd6
 .../remote_content_1.3.ds.xml                              | 7 +++++++
fa2dd6
 2 files changed, 14 insertions(+)
fa2dd6
fa2dd6
diff --git a/tests/DS/ds_continue_without_remote_resources/remote_content_1.2.ds.xml b/tests/DS/ds_continue_without_remote_resources/remote_content_1.2.ds.xml
fa2dd6
index 31d4fc770..503b688ec 100644
fa2dd6
--- a/tests/DS/ds_continue_without_remote_resources/remote_content_1.2.ds.xml
fa2dd6
+++ b/tests/DS/ds_continue_without_remote_resources/remote_content_1.2.ds.xml
fa2dd6
@@ -43,6 +43,13 @@
fa2dd6
       <var_ref>oval:x:var:1</var_ref>
fa2dd6
     </variable_object>
fa2dd6
     </objects>
fa2dd6
+
fa2dd6
+    <variables>
fa2dd6
+      <constant_variable id="oval:x:var:1" version="1" comment="x" datatype="int">
fa2dd6
+        <value>100</value>
fa2dd6
+      </constant_variable>
fa2dd6
+    </variables>
fa2dd6
+
fa2dd6
 </oval_definitions>
fa2dd6
 </ds:component>
fa2dd6
 
fa2dd6
diff --git a/tests/DS/ds_continue_without_remote_resources/remote_content_1.3.ds.xml b/tests/DS/ds_continue_without_remote_resources/remote_content_1.3.ds.xml
fa2dd6
index 3cf15f8df..bea285bc1 100644
fa2dd6
--- a/tests/DS/ds_continue_without_remote_resources/remote_content_1.3.ds.xml
fa2dd6
+++ b/tests/DS/ds_continue_without_remote_resources/remote_content_1.3.ds.xml
fa2dd6
@@ -45,6 +45,13 @@
fa2dd6
       <var_ref>oval:x:var:1</var_ref>
fa2dd6
     </variable_object>
fa2dd6
     </objects>
fa2dd6
+
fa2dd6
+    <variables>
fa2dd6
+      <constant_variable id="oval:x:var:1" version="1" comment="x" datatype="int">
fa2dd6
+        <value>100</value>
fa2dd6
+      </constant_variable>
fa2dd6
+    </variables>
fa2dd6
+
fa2dd6
 </oval_definitions>
fa2dd6
 </ds:component>
fa2dd6