Merge pull request #1975 from evgenyz/fix-dbusmock

Fix D-Bus mock init/cleanup and fwupdsecattr probe initialization

Author: jan-cerny

src/OVAL/probes/unix/linux/fwupdsecattr_probe.c

@@ -292,11 +292,6 @@ int fwupdsecattr_probe_main(probe_ctx *ctx, void *arg)
 	const char *hsi_result_str;
 	uint64_t hsi_result = UINT64_MAX;
 
-	/* arg is NULL if regex compilation failed */
-	if (arg == NULL) {
-		return PROBE_EINIT;
-	}
-
 	probe_in = probe_ctx_getobject(ctx);
 	if (probe_in == NULL)
 		return PROBE_ENOOBJ;

tests/probes/fwupdsecattr/test_probes_fwupdsecattr_mock.sh

@@ -18,7 +18,7 @@ function test_probes_fwupdsecattr {
     [ -f $RF ] && rm -f $RF
 
     init_dbus_mock $DBUS_MOCK_NAME
-    $OSCAP oval eval --results $RF $DF 2>$stderr
+    $OSCAP oval eval --results $RF $DF 2>$stderr || true
     clean_dbus_mock $DBUS_MOCK_NAME
 
     if [ -f $RF ]; then

tests/test_common.sh.in

@@ -368,7 +368,7 @@ init_dbus_mock() {
 	require_python_module "dbusmock" || return 255
 	require "gdbus" || return 255
 	printf "%s\n" "Initializing D-Bus mock from template: $1.py"
-	python3 -m dbusmock --template "${srcdir}/$1.py" & disown
+	python3 -m dbusmock --template "${srcdir}/$1.py" &
 	# We have to replace system bus address because mock D-Bus
 	# endpoint is created inside the user session
 	export DBUS_SYSTEM_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS
@@ -380,6 +380,7 @@ clean_dbus_mock() {
 	require "gdbus" || return 255
 	printf "%s\n" "Shutting down D-Bus mock: $1"
 	gdbus call --session -d "$1" -o / -m "$1.Exit" >/dev/null 2>&1 || true
+	export DBUS_SYSTEM_BUS_ADDRESS=
 }
 
 export -f assert_exists