From 2764bfc6e06ba9fd357f217daa27037335ba9cdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>
Date: Thu, 21 Dec 2023 11:15:46 +0100
Subject: [PATCH] Make systemdunitproperty probe test more independent

The current test of the `systemdunitproperty` probe is relying on the
assumption that the `systemd-journald.service` unit doesn't have the
`Conflicts` property set. In Rawhide, this assumption is no longer true,
because `Conflicts` is now set to `soft-reboot.target` by default. This
change breaks our test. In this commit, we will make the test less
dependent on actual property value. Instead, we will check a dummy
property that is unlikely to occur.

Fixes: #2066
---
 .../systemdunitproperty/test_probes_systemdunitproperty.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/probes/systemdunitproperty/test_probes_systemdunitproperty.xml b/tests/probes/systemdunitproperty/test_probes_systemdunitproperty.xml
index fee5cc0b62e..983c9ffe30b 100644
--- a/tests/probes/systemdunitproperty/test_probes_systemdunitproperty.xml
+++ b/tests/probes/systemdunitproperty/test_probes_systemdunitproperty.xml
@@ -94,12 +94,12 @@
       <state state_ref="oval:0:ste:3"/>
     </systemdunitproperty_test>
 
-    <!-- check that there doesn't exist systemd-journald.service unit with valid Conflicts property -->
+    <!-- check that there doesn't exist systemd-journald.service unit with valid OscapTestingProperty property -->
     <systemdunitproperty_test id="oval:0:tst:5" check="all" check_existence="none_exist" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux" comment="true" version="1">
       <object object_ref="oval:0:obj:5"/>
     </systemdunitproperty_test>
 
-    <!-- check if there is at least one systemd-journald.service unit it has value of Conflicts property equal to empty string -->
+    <!-- check if there is at least one systemd-journald.service unit it has value of OscapTestingProperty property equal to empty string -->
     <systemdunitproperty_test id="oval:0:tst:6" check="all" check_existence="at_least_one_exists" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux" comment="false" version="1">
       <object object_ref="oval:0:obj:5"/>
       <state state_ref="oval:0:ste:4"/>
@@ -145,7 +145,7 @@
 
     <systemdunitproperty_object id="oval:0:obj:5" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
       <unit>systemd-journald.service</unit>
-      <property>Conflicts</property>
+      <property>OscapTestingProperty</property>
     </systemdunitproperty_object>
 
     <systemdunitproperty_object id="oval:0:obj:6" version="1" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">