Add macOS regression coverage for portability fixes

Author: ed-silva-eb

tests/API/XCCDF/unittests/CMakeLists.txt

@@ -17,6 +17,10 @@ add_oscap_test_executable(test_xccdf_shall_pass
 )
 target_link_libraries(test_xccdf_shall_pass openscap ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBXSLT_EXSLT_LIBRARIES} ${PCRE2_LIBRARIES} ${CURL_LIBRARIES} ${RPM_LIBRARIES})
 
+add_oscap_test_executable(test_xccdf_result_sysinfo_platform
+	"test_xccdf_result_sysinfo_platform.c"
+)
+
 if(PYTHONINTERP_FOUND)
 	add_oscap_test("all_python.sh")
 endif()
@@ -109,6 +113,7 @@ add_oscap_test("test_fix_resultid_by_suffix.sh")
 add_oscap_test("test_generate_fix_ansible_vars.sh")
 add_oscap_test("test_xccdf_requires_conflicts.sh")
 add_oscap_test("test_results_hostname.sh")
+add_oscap_test("test_xccdf_result_sysinfo_platform.sh" LABELS macos)
 add_oscap_test("test_skip_rule.sh")
 add_oscap_test("test_no_newline_between_select_elements.sh")
 add_oscap_test("test_single_line_tailoring.sh")

tests/API/XCCDF/unittests/test_xccdf_result_sysinfo_platform.c

@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "xccdf_benchmark.h"
+
+int main(void)
+{
+	struct xccdf_result *result = xccdf_result_new();
+	struct xccdf_target_fact_iterator *facts = NULL;
+	bool saw_mac = false;
+	bool saw_asset_mac = false;
+
+	xccdf_result_fill_sysinfo(result);
+	facts = xccdf_result_get_target_facts(result);
+
+	while (xccdf_target_fact_iterator_has_more(facts)) {
+		struct xccdf_target_fact *fact = xccdf_target_fact_iterator_next(facts);
+		const char *name = xccdf_target_fact_get_name(fact);
+
+		if (name == NULL)
+			continue;
+
+		if (strcmp(name, "urn:xccdf:fact:ethernet:MAC") == 0)
+			saw_mac = true;
+		if (strcmp(name, "urn:xccdf:fact:asset:identifier:mac") == 0)
+			saw_asset_mac = true;
+	}
+
+	xccdf_target_fact_iterator_free(facts);
+	xccdf_result_free(result);
+
+#if defined(OS_APPLE)
+	if (!saw_mac) {
+		fprintf(stderr, "Expected at least one urn:xccdf:fact:ethernet:MAC fact on macOS.\n");
+		return 1;
+	}
+	if (!saw_asset_mac) {
+		fprintf(stderr, "Expected at least one urn:xccdf:fact:asset:identifier:mac fact on macOS.\n");
+		return 1;
+	}
+#endif
+
+	return 0;
+}

tests/API/XCCDF/unittests/test_xccdf_result_sysinfo_platform.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+. $builddir/tests/test_common.sh
+
+if [ -n "${CUSTOM_OSCAP+x}" ] ; then
+	exit 255
+fi
+
+case "$(uname)" in
+	Darwin) ;;
+	*) exit 255 ;;
+esac
+
+./test_xccdf_result_sysinfo_platform

tests/probes/password/CMakeLists.txt

@@ -1,5 +1,5 @@
 if(ENABLE_PROBES_UNIX)
 	add_oscap_test("test_probes_password.sh" LABELS unix freebsd macos)
-	add_oscap_test("test_probes_password_offline.sh" LABELS unix)
+	add_oscap_test("test_probes_password_offline.sh" LABELS unix macos)
 	add_oscap_test("test_probes_password_offline_fallback.sh" LABELS unix macos)
 endif()

tests/probes/password/test_probes_password_offline.sh

@@ -32,12 +32,12 @@ function test_probes_password {
     tmpdir=$(mktemp -t -d "test_password.XXXXXX")
     mkdir -p "$tmpdir/etc"
     echo "root:x:0:0:root:/root:/bin/bash" > "$tmpdir/etc/passwd"
-    set_chroot_offline_test_mode "$tmpdir"
+    set_offline_chroot_dir "$tmpdir"
 
     $OSCAP oval eval --results $RF $DF
 
-    unset_chroot_offline_test_mode
-    rm -rf $tempdir
+    set_offline_chroot_dir ""
+    rm -rf "$tmpdir"
 
     if [ -f $RF ]; then
         result=$RF

tests/probes/password/test_probes_password_offline_fallback.sh

@@ -26,9 +26,9 @@ invalid_line_without_separators
 root:x:0:0:root:/root:/bin/bash
 EOF
 
-	set_chroot_offline_test_mode "$tmpdir"
+	set_offline_chroot_dir "$tmpdir"
 	$OSCAP oval eval --results "$RF" "$DF"
-	unset_chroot_offline_test_mode
+	set_offline_chroot_dir ""
 	rm -rf "$tmpdir"
 
 	if [ -f "$RF" ]; then

tests/probes/runlevel/CMakeLists.txt

@@ -1,3 +1,4 @@
 if(ENABLE_PROBES_UNIX)
 	add_oscap_test("test_probes_runlevel.sh" LABELS unix linux_only)
+	add_oscap_test("test_probes_runlevel_unsupported.sh" LABELS unix macos freebsd)
 endif()

tests/probes/runlevel/test_probes_runlevel_unsupported.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+. $builddir/tests/test_common.sh
+
+set -e -o pipefail
+
+function test_probes_runlevel_unsupported {
+	probecheck "runlevel" || return 255
+
+	case "$(uname)" in
+		Darwin|FreeBSD) ;;
+		*) return 255 ;;
+	esac
+
+	local definition="${top_srcdir}/tests/oval_details/runlevel.oval.xml"
+	local results="results_unsupported.xml"
+	[ -f "$results" ] && rm -f "$results"
+
+	$OSCAP oval eval --results "$results" "$definition"
+
+	result="$results"
+	assert_exists 1 'oval_results/results/system/definitions/definition[@definition_id="oval:x:def:1"][@result="error"]'
+	assert_exists 1 'oval_results/results/system/tests/test[@test_id="oval:x:tst:1"][@result="error"]'
+	assert_exists 1 'oval_results/results/system/oval_system_characteristics/collected_objects/object[@id="oval:ssg:obj:1313"][@flag="error"]'
+	assert_exists 1 'oval_results/results/system/oval_system_characteristics/collected_objects/object/message[text()="get_runlevel failed."]'
+}
+
+test_init
+
+test_run "test_probes_runlevel_unsupported" test_probes_runlevel_unsupported
+
+test_exit