Update tests to use dynamic results file name

Mab879 · Mab879 · commit 691e2f04ee68 · 2025-12-19T14:22:08.000-06:00
So that we run tests in parallel
diff --git a/tests/API/XCCDF/unittests/test_xccdf_results_arf_asset.sh b/tests/API/XCCDF/unittests/test_xccdf_results_arf_asset.sh
@@ -7,7 +7,7 @@ set -o pipefail
 
 function test_xccdf_results_arf_asset {
     local DS="${srcdir}/test_xccdf_results_arf_no_oval.xccdf.xml"
-    local result="results.xml"
+    local result="$(mktemp results.XXXXXXX.xml)"
     local stderr="error.log"
 
     [ -f $result ] && rm -f $result
diff --git a/tests/curl/test_curl_encoding.sh b/tests/curl/test_curl_encoding.sh
@@ -9,7 +9,7 @@ function curl_accept_encoding {
 	require_internet || return 255
 
 	local DF="${srcdir}/ds.xml"
-	local RF="results.xml"
+	local RF="$(mktemp results.XXXXXXX.xml)"
 	local LOG="verbose.log"
 
 	$OSCAP xccdf --verbose=DEVEL eval --fetch-remote-resources --results $RF $DF 2>$LOG || echo "OK"
diff --git a/tests/probes/family/test_probes_family.sh b/tests/probes/family/test_probes_family.sh
@@ -22,7 +22,7 @@ function test_probes_family {
 
     local ret_val=0;
     local DF="${srcdir}/test_probes_family.xml"
-    local RF="results.xml"
+    local RF="$(mktemp results.XXXXXXX.xml)"
 
     [ -f $RF ] && rm -f $RF
 
diff --git a/tests/probes/file/test_probes_file.sh b/tests/probes/file/test_probes_file.sh
@@ -22,7 +22,7 @@ function test_probes_file {
 
     local ret_val=0;
     local DF="$srcdir/test_probes_file.xml"
-    local RF="results.xml"
+    local RF="$(mktemp results.XXXXXXX.xml)"
 
     [ -f $RF ] && rm -f $RF
 
@@ -50,7 +50,7 @@ function test_probes_file_filenames {
 
 	local ret_val=0
 	local DF="$srcdir/test_probes_file_filename.xml"
-	result="results.xml"
+	result="$(mktemp results.XXXXXXX.xml)"
 	files_dir=$(mktemp -d)
 	DF_INJECTED=$(mktemp)
 
@@ -95,7 +95,7 @@ function test_probes_file_invalid_utf8 {
 
 	local ret_val=0
 	local DF="$srcdir/test_probes_file_filename.xml"
-	result="results.xml"
+	result="$(mktemp results.XXXXXXX.xml)"
 	files_dir=$(mktemp -d)
 	DF_INJECTED=$(mktemp)
 
diff --git a/tests/probes/file/test_probes_file_behaviour.sh b/tests/probes/file/test_probes_file_behaviour.sh
@@ -40,7 +40,7 @@ function test_probes_file_behaviour {
 
 	local ret_val=0
 	local DF="$srcdir/test_probes_file_behaviour.xml"
-	result="results.xml"
+	result="$(mktemp results.XXXXXXX.xml)"
 
 	test_probes_behaviour_setup
 
diff --git a/tests/probes/fileextendedattribute/test_probes_fileextendedattribute.sh b/tests/probes/fileextendedattribute/test_probes_fileextendedattribute.sh
@@ -12,7 +12,7 @@ function test_probes_fileextendedattribute {
 
     local ret_val=0;
     local DEFFILE="$srcdir/test_probes_fileextendedattribute.xml"
-    local RESFILE="results.xml"
+    local RESFILE="$(mktemp results.XXXXXXX.xml)"
 
     [ -f $RESFILE ] && rm -f $RESFILE
 
diff --git a/tests/probes/filehash/test_probes_filehash.sh b/tests/probes/filehash/test_probes_filehash.sh
@@ -24,7 +24,7 @@ function test_probes_filehash {
 
     local ret_val=0;
     local DF="test_probes_filehash.xml"
-    local RF="results.xml"
+    local RF="$(mktemp results.XXXXXXX.xml)"
 
     [ -f $RF ] && rm -f $RF
 
diff --git a/tests/probes/filehash58/test_probes_filehash58.sh b/tests/probes/filehash58/test_probes_filehash58.sh
@@ -24,7 +24,7 @@ function test_probes_filehash58_old_algos {
 
     local ret_val=0;
     local DF="test_probes_filehash58_old_algos.xml"
-    local RF="results.xml"
+    local RF="$(mktemp results.XXXXXXX.xml)"
 
     [ -f $RF ] && rm -f $RF
 
@@ -52,7 +52,7 @@ function test_probes_filehash58_new_algos {
 
     local ret_val=0
     local DF="test_probes_filehash58_new_algos.xml"
-    local RF="results.xml"
+    local RF="$(mktemp results.XXXXXXX.xml)"
 
     [ -f $RF ] && rm -f $RF
 
diff --git a/tests/probes/filemd5/test_probes_filemd5.sh b/tests/probes/filemd5/test_probes_filemd5.sh
@@ -23,7 +23,7 @@ function test_probes_filemd5 {
 
     local ret_val=0;
     local DEFFILE="test_probes_filemd5.xml"
-    local RESFILE="results.xml"
+    local RESFILE="$(mktemp results.XXXXXXX.xml)"
 
     [ -f $RESFILE ] && rm -f $RESFILE
 
diff --git a/tests/probes/fwupdsecattr/test_probes_fwupdsecattr.sh b/tests/probes/fwupdsecattr/test_probes_fwupdsecattr.sh
@@ -16,7 +16,7 @@ function test_probes_fwupdsecattr {
 
     local ret_val=0
     local DF="${srcdir}/test_probes_fwupdsecattr.xml"
-    local RF="results.xml"
+    local RF="$(mktemp results.XXXXXXX.xml)"
 
     [ -f $RF ] && rm -f $RF
 
diff --git a/tests/probes/fwupdsecattr/test_probes_fwupdsecattr_mock.sh b/tests/probes/fwupdsecattr/test_probes_fwupdsecattr_mock.sh
@@ -10,7 +10,7 @@ function test_probes_fwupdsecattr {
 
     local ret_val=0
     local DF="${srcdir}/test_probes_fwupdsecattr_mock.xml"
-    local RF="results.xml"
+    local RF="$(mktemp results.XXXXXXX.xml)"
     local DBUS_MOCK_NAME="org.freedesktop.fwupd"
     local stderr=$(mktemp test_probes_fwupdsecattr_mock.err.XXXXXX)
     echo "stderr file: $stderr"
diff --git a/tests/probes/interface/test_probes_interface.sh b/tests/probes/interface/test_probes_interface.sh
@@ -21,7 +21,7 @@ function test_probes_interface {
 
     local ret_val=0;
     local DF="test_probes_interface.xml"
-    local RF="results.xml"
+    local RF="$(mktemp results.XXXXXXX.xml)"
 
     [ -f $RF ] && rm -f $RF
 
diff --git a/tests/probes/isainfo/test_probes_isainfo.sh b/tests/probes/isainfo/test_probes_isainfo.sh
@@ -22,7 +22,7 @@ function test_probes_isainfo {
 
     local ret_val=0;
     local DF="test_probes_isainfo.xml"
-    local RF="results.xml"
+    local RF="$(mktemp results.XXXXXXX.xml)"
    
     [ -f $RF ] && rm -f $RF
 
diff --git a/tests/probes/password/test_probes_password.sh b/tests/probes/password/test_probes_password.sh
@@ -22,7 +22,7 @@ function test_probes_password {
 
     local ret_val=0;
     local DF="test_probes_password.xml"
-    local RF="results.xml"
+    local RF="$(mktemp results.XXXXXXX.xml)"
    
     [ -f $RF ] && rm -f $RF
 
diff --git a/tests/probes/password/test_probes_password_offline.sh b/tests/probes/password/test_probes_password_offline.sh
@@ -25,7 +25,7 @@ function test_probes_password {
 
     local ret_val=0;
     local DF="${srcdir}/test_probes_password_offline.xml"
-    local RF="results.xml"
+    local RF="$(mktemp results.XXXXXXX.xml)"
 
     [ -f $RF ] && rm -f $RF
 
diff --git a/tests/probes/rpm/rpminfo/rpminfo_common.sh b/tests/probes/rpm/rpminfo/rpminfo_common.sh
@@ -24,7 +24,7 @@ function test_probes_rpminfo {
 
     local ret_val=0;
     local DF="test_probes_rpminfo.xml"
-    local RF="results.xml"
+    local RF="$(mktemp results.XXXXXXX.xml)"
 
     rm -f $RF
 
diff --git a/tests/probes/rpm/rpmverify/test_probes_rpmverify_not_equals_operation.sh b/tests/probes/rpm/rpmverify/test_probes_rpmverify_not_equals_operation.sh
@@ -11,7 +11,7 @@ function perform_test {
     rpm -qf /root || return 255
 
     DF="$srcdir/test_probes_rpmverify_not_equals_operation.xml"
-    RF="results.xml"
+    RF="$(mktemp results.XXXXXXX.xml)"
 
     rm -f $RF
 
diff --git a/tests/probes/rpm/rpmverify/test_probes_rpmverify_not_equals_operation_offline.sh b/tests/probes/rpm/rpmverify/test_probes_rpmverify_not_equals_operation_offline.sh
@@ -10,7 +10,7 @@ function perform_test {
     probecheck "rpmverify" || return 255
 
     DF="$srcdir/test_probes_rpmverify_not_equals_operation_offline.xml"
-    RF="results.xml"
+    RF="$(mktemp results.XXXXXXX.xml)"
 
     rm -f $RF
 
diff --git a/tests/probes/rpm/rpmverifyfile/test_probes_rpmverifyfile.sh b/tests/probes/rpm/rpmverifyfile/test_probes_rpmverifyfile.sh
@@ -14,7 +14,7 @@ function test_probes_rpmverifyfile {
     require "rpm" || return 255
 
     DF="$srcdir/test_probes_rpmverifyfile.xml"
-    RF="results.xml"
+    RF="$(mktemp results.XXXXXXX.xml)"
 
     rm -f $RF
 
diff --git a/tests/probes/rpm/rpmverifyfile/test_probes_rpmverifyfile_offline.sh b/tests/probes/rpm/rpmverifyfile/test_probes_rpmverifyfile_offline.sh
@@ -14,7 +14,7 @@ function test_probes_rpmverifyfile {
     probecheck "rpmverifyfile" || return 255
 
     DF="$srcdir/test_probes_rpmverifyfile_offline.xml"
-    RF="results.xml"
+    RF="$(mktemp results.XXXXXXX.xml)"
 
     rm -f $RF
 
diff --git a/tests/probes/rpm/rpmverifyfile/test_probes_rpmverifyfile_older.sh b/tests/probes/rpm/rpmverifyfile/test_probes_rpmverifyfile_older.sh
@@ -14,7 +14,7 @@ function test_probes_rpmverifyfile {
     require "rpm" || return 255
 
     DF="$srcdir/test_probes_rpmverifyfile_older.xml"
-    RF="results.xml"
+    RF="$(mktemp results.XXXXXXX.xml)"
 
     rm -f $RF
 
diff --git a/tests/probes/shadow/test_probes_shadow.sh b/tests/probes/shadow/test_probes_shadow.sh
@@ -22,7 +22,7 @@ function test_probes_shadow {
 
     local ret_val=0;
     local DF="test_probes_shadow.xml"
-    local RF="results.xml"
+    local RF="$(mktemp results.XXXXXXX.xml)"
 
     [ -f $RF ] && rm -f $RF
 
diff --git a/tests/probes/shadow/test_probes_shadow_offline.sh b/tests/probes/shadow/test_probes_shadow_offline.sh
@@ -24,7 +24,7 @@ function test_probes_shadow {
 
     local ret_val=0;
     local DF="${srcdir}/test_probes_shadow_offline.xml"
-    local RF="results.xml"
+    local RF="$(mktemp results.XXXXXXX.xml)"
 
     [ -f $RF ] && rm -f $RF
 
diff --git a/tests/probes/symlink/test_probes_symlink.sh b/tests/probes/symlink/test_probes_symlink.sh
@@ -13,7 +13,7 @@ function test_probes_symlink {
     probecheck "symlink" || return 255
 
     DF="test_probes_symlink.xml"
-    RF="results.xml"
+    RF="$(mktemp results.XXXXXXX.xml)"
 
     rm -f $RF
 
diff --git a/tests/probes/systemdunitproperty/test_probes_systemdunitproperty.sh b/tests/probes/systemdunitproperty/test_probes_systemdunitproperty.sh
@@ -16,7 +16,7 @@ function test_probes_systemdunitproperty {
 
     local ret_val=0;
     local DF="${srcdir}/test_probes_systemdunitproperty.xml"
-    local RF="results.xml"
+    local RF="$(mktemp results.XXXXXXX.xml)"
     local stderr=$(mktemp $1.err.XXXXXX)
     echo "stderr file: $stderr"
 
diff --git a/tests/probes/systemdunitproperty/test_probes_systemdunitproperty_mount_wants.sh b/tests/probes/systemdunitproperty/test_probes_systemdunitproperty_mount_wants.sh
@@ -15,7 +15,7 @@ function test_probes_systemdunitproperty_mount_wants {
     systemctl show -- -.mount | grep -Eq "Wants=\S+" || return 255
 
     local DF="${srcdir}/test_probes_systemdunitproperty_mount_wants.xml"
-    local RF="results.xml"
+    local RF="$(mktemp results.XXXXXXX.xml)"
 
     [ -f $RF ] && rm -f $RF
 
diff --git a/tests/probes/systemdunitproperty/test_probes_systemdunitproperty_offline_mode.sh b/tests/probes/systemdunitproperty/test_probes_systemdunitproperty_offline_mode.sh
@@ -17,7 +17,7 @@ function test_probes_systemdunitproperty_offline_mode {
 
     local ret_val=0;
     local DF="${srcdir}/test_probes_systemdunitproperty_offline_mode.xml"
-    local RF="results.xml"
+    local RF="$(mktemp results.XXXXXXX.xml)"
     local stderr=$(mktemp $1.err.XXXXXX)
     echo "stderr file: $stderr"
 
diff --git a/tests/probes/textfilecontent54/test_negative_instance.sh b/tests/probes/textfilecontent54/test_negative_instance.sh
@@ -8,7 +8,7 @@ function test_negative_instance {
 	
     local ret_val=0;
     local DF="${srcdir}/test_negative_instance.xml"
-    local RF="results.xml"
+    local RF="$(mktemp results.XXXXXXX.xml)"
     
     [ -f $RF ] && rm -f $RF
 
diff --git a/tests/probes/textfilecontent54/test_probes_textfilecontent54.sh b/tests/probes/textfilecontent54/test_probes_textfilecontent54.sh
@@ -20,7 +20,7 @@ function test_probes_textfilecontent54 {
 	
     local ret_val=0;
     local DF="${srcdir}/test_probes_textfilecontent54.xml"
-    local RF="results.xml"
+    local RF="$(mktemp results.XXXXXXX.xml)"
     
     [ -f $RF ] && rm -f $RF
 
diff --git a/tests/probes/uname/test_probes_uname.sh b/tests/probes/uname/test_probes_uname.sh
@@ -23,7 +23,7 @@ function test_probes_uname {
 
     local ret_val=0;
     local DF="test_probes_uname.xml"
-    local RF="results.xml"
+    local RF="$(mktemp results.XXXXXXX.xml)"
 
     [ -f $RF ] && rm -f $RF
     
diff --git a/tests/probes/yamlfilecontent/test_probes_yamlfilecontent_array.sh b/tests/probes/yamlfilecontent/test_probes_yamlfilecontent_array.sh
@@ -8,7 +8,7 @@ function test_probes_yamlfilecontent_array {
 
     local ret_val=0
     local DF="${srcdir}/test_probes_yamlfilecontent_array.xml"
-    local RF="results.xml"
+    local RF="$(mktemp results.XXXXXXX.xml)"
 
     [ -f $RF ] && rm -f $RF
 
diff --git a/tests/probes/yamlfilecontent/test_probes_yamlfilecontent_content.sh b/tests/probes/yamlfilecontent/test_probes_yamlfilecontent_content.sh
@@ -7,7 +7,7 @@ set -e -o pipefail
 probecheck "yamlfilecontent" || exit 255
 
 oval_file="${srcdir}/test_probes_yamlfilecontent_content.xml"
-result="results.xml"
+result="$(mktemp results.XXXXXXX.xml)"
 
 [ -f $result ] && rm -f $result
 
@@ -21,4 +21,4 @@ assert_exists 1 $sd'/ind-sys:yamlfilecontent_item/ind-sys:value/field[@name="foo
 assert_exists 1 $sd'/ind-sys:yamlfilecontent_item/ind-sys:value/field[@name="#" and @datatype="boolean" and text()="true"]'
 assert_exists 2 $sd'/ind-sys:yamlfilecontent_item/ind-sys:value/field[@name="#" and text()="<value>"]'
 
-rm -f "$result"
+rm -f "$result"
diff --git a/tests/probes/yamlfilecontent/test_probes_yamlfilecontent_key.sh b/tests/probes/yamlfilecontent/test_probes_yamlfilecontent_key.sh
@@ -8,7 +8,7 @@ function test_probes_yamlfilecontent_key {
 
     local ret_val=0
     local DF="${srcdir}/test_probes_yamlfilecontent_key.xml"
-    local RF="results.xml"
+    local RF="$(mktemp results.XXXXXXX.xml)"
 
     [ -f $RF ] && rm -f $RF
 
diff --git a/tests/probes/yamlfilecontent/test_probes_yamlfilecontent_offline_mode.sh b/tests/probes/yamlfilecontent/test_probes_yamlfilecontent_offline_mode.sh
@@ -10,7 +10,7 @@ function test_probes_yamlfilecontent_offline_mode {
 
     local ret_val=0
     local DF="${srcdir}/test_probes_yamlfilecontent_offline_mode.xml"
-    local RF="results.xml"
+    local RF="$(mktemp results.XXXXXXX.xml)"
     local YAML_FILE="openshift-logging.yaml"
 
     [ -f $RF ] && rm -f $RF
diff --git a/tests/probes/yamlfilecontent/test_probes_yamlfilecontent_types.sh b/tests/probes/yamlfilecontent/test_probes_yamlfilecontent_types.sh
@@ -10,7 +10,7 @@ function test_probes_yamlfilecontent_types {
 
     local ret_val=0
     local oval_file="${srcdir}/test_probes_yamlfilecontent_types.xml"
-    local result="results.xml"
+    local result="$(mktemp results.XXXXXXX.xml)"
 
     [ -f $result ] && rm -f $result
 
