Improve tests for container

Detect docker container usage when running test to handle cases where
systemd is unlikely to be running.

Signed-off-by: William Douglas <[email protected]>

Author: William Douglas

test/functional/api/api-autoupdate.bats

@@ -41,7 +41,11 @@ test_setup() {
 
 	run sudo sh -c "$SWUPD autoupdate $SWUPD_OPTS --disable --quiet"
 
-	assert_status_is "$SWUPD_OK"
+	if [ "$(systemd-detect-virt)" = "docker" ] ; then
+		assert_status_is "$SWUPD_SUBPROCESS_ERROR"
+	else
+		assert_status_is "$SWUPD_OK"
+	fi
 	assert_output_is_empty
 	# check mask files don't exist
 	assert_symlink_exists "$ABS_TARGET_DIR"/etc/systemd/system/swupd-update.service

test/functional/autoupdate/aup-basic.bats

@@ -15,7 +15,11 @@ test_setup() {
 
 	# perform autoupdate disable
 	run sudo sh -c "$SWUPD autoupdate --disable $SWUPD_OPTS"
-	assert_status_is "$SWUPD_OK"
+	if [ "$(systemd-detect-virt)" = "docker" ] ; then
+		assert_status_is "$SWUPD_SUBPROCESS_ERROR"
+	else
+		assert_status_is "$SWUPD_OK"
+	fi
 	expected_output=$(cat <<-EOM
 		Warning: disabling automatic updates may take you out of compliance with your IT policy
 		Running systemctl to disable updates