From b6248500fbc6c79237e9b12cd68763cca3c3c86d Mon Sep 17 00:00:00 2001
From: Packit Service <user-cont-team+packit-service@redhat.com>
Date: Dec 09 2020 13:21:09 +0000
Subject: Apply patch 0047-test-dbus-zone-add-nm-shared-to-expected-output-if-i.patch


patch_name: 0047-test-dbus-zone-add-nm-shared-to-expected-output-if-i.patch
present_in_specfile: true
location_in_specfile: 47

---

diff --git a/src/tests/dbus/zone_permanent_functional.at b/src/tests/dbus/zone_permanent_functional.at
index 2261832..7564598 100644
--- a/src/tests/dbus/zone_permanent_functional.at
+++ b/src/tests/dbus/zone_permanent_functional.at
@@ -30,8 +30,12 @@ export DBUS_FOOBAR_ZONE_OBJ
 
 dnl Get Zones
 dnl
+if NS_CMD([firewall-cmd --get-zones |grep "nm-shared" >/dev/null]); then
+    NM_SHARED="'nm-shared', "
+    export NM_SHARED
+fi
 DBUS_CHECK([config], [config.getZoneNames], [], 0, [dnl
-    [(['block', 'dmz', 'drop', 'external', 'foobar', 'home', 'internal', 'public', 'trusted', 'work'],)]
+    (@<:@'block', 'dmz', 'drop', 'external', 'foobar', 'home', 'internal', m4_escape([${NM_SHARED}])'public', 'trusted', 'work'@:>@,)
 ])
 DBUS_CHECK([config], [config.listZones], [], 0, [stdout])
 NS_CHECK([sed -e ["s/['][,]/'\n/g"] ./stdout |dnl
diff --git a/src/tests/dbus/zone_runtime_functional.at b/src/tests/dbus/zone_runtime_functional.at
index bb0798a..b5799b9 100644
--- a/src/tests/dbus/zone_runtime_functional.at
+++ b/src/tests/dbus/zone_runtime_functional.at
@@ -36,8 +36,12 @@ DBUS_CHECK([], [getDefaultZone], [], 0, [dnl
 ])
 
 dnl Fetching Zones
+if NS_CMD([firewall-cmd --get-zones |grep "nm-shared" >/dev/null]); then
+    NM_SHARED="'nm-shared', "
+    export NM_SHARED
+fi
 DBUS_CHECK([], [zone.getZones], [], 0, [dnl
-    [(['block', 'dmz', 'drop', 'external', 'home', 'internal', 'public', 'trusted', 'work'],)]
+    (@<:@'block', 'dmz', 'drop', 'external', 'home', 'internal', m4_escape([${NM_SHARED}])'public', 'trusted', 'work'@:>@,)
 ])
 FWD_CHECK([-q --zone public --add-interface dummy0])
 FWD_CHECK([-q --zone public --add-source 10.1.1.1])