|
 |
8a3219 |
From 4d2a2b79aefac90d4656b0d9c3b58661d2b88a07 Mon Sep 17 00:00:00 2001
|
|
|
8a3219 |
From: Eric Garver <eric@garver.life>
|
|
|
8a3219 |
Date: Tue, 25 Jun 2019 14:04:34 -0400
|
|
|
8a3219 |
Subject: [PATCH 12/20] fix: tests/functions: use gdbus instead of dbus-send
|
|
|
8a3219 |
|
|
|
8a3219 |
dbus-send doesn't support all the types and nested types that we need
|
|
|
8a3219 |
for testing.
|
|
|
8a3219 |
|
|
|
8a3219 |
(cherry picked from commit 15346d6ff16e75bbbd05e40ac2e8cbe051e08dd9)
|
|
|
8a3219 |
---
|
|
|
8a3219 |
src/tests/functions.at | 16 +++++++++++++---
|
|
|
8a3219 |
1 file changed, 13 insertions(+), 3 deletions(-)
|
|
|
8a3219 |
|
|
|
8a3219 |
diff --git a/src/tests/functions.at b/src/tests/functions.at
|
|
|
8a3219 |
index 7a0242cb33fb..28af5a7fc532 100644
|
|
|
8a3219 |
--- a/src/tests/functions.at
|
|
|
8a3219 |
+++ b/src/tests/functions.at
|
|
|
8a3219 |
@@ -355,10 +355,20 @@ m4_define([NFT_LIST_SET], [
|
|
|
8a3219 |
])
|
|
|
8a3219 |
])
|
|
|
8a3219 |
|
|
|
8a3219 |
+m4_define([DBUS_CHECK_NORMALIZE], [dnl
|
|
|
8a3219 |
+ [sed -e 's/^({//' -e 's/},)$//' -e 's/>,/>\n/g'] | dnl truncate dictionary output
|
|
|
8a3219 |
+ TRIM_WHITESPACE | dnl
|
|
|
8a3219 |
+ sort dnl sort dictionaries by keys
|
|
|
8a3219 |
+])
|
|
|
8a3219 |
+
|
|
|
8a3219 |
m4_define([DBUS_CHECK], [
|
|
|
8a3219 |
- NS_CHECK([dbus-send --system --print-reply --dest=org.fedoraproject.FirewallD1 dnl
|
|
|
8a3219 |
- /org/fedoraproject/FirewallD1/$1 org.fedoraproject.FirewallD1.$2 $3],
|
|
|
8a3219 |
- [$4], [$5], [$6], [$7], [$8])
|
|
|
8a3219 |
+ AT_SKIP_IF([! NS_CMD([which gdbus >/dev/null 2>&1])])
|
|
|
8a3219 |
+ NS_CHECK([PIPESTATUS0([gdbus call --system --dest=org.fedoraproject.FirewallD1 dnl
|
|
|
8a3219 |
+ m4_ifblank([$1], [--object-path /org/fedoraproject/FirewallD1],
|
|
|
8a3219 |
+ [--object-path /org/fedoraproject/FirewallD1/$1]) dnl
|
|
|
8a3219 |
+ --method org.fedoraproject.FirewallD1.$2 $3],
|
|
|
8a3219 |
+ [DBUS_CHECK_NORMALIZE])],
|
|
|
8a3219 |
+ [$4], [m4_strip([$5])], [m4_strip([$6])], [$7], [$8])
|
|
|
8a3219 |
])
|
|
|
8a3219 |
|
|
|
8a3219 |
m4_define([DBUS_GETALL_NORMALIZE], dnl
|
|
|
8a3219 |
--
|
|
|
8a3219 |
2.20.1
|
|
|
8a3219 |
|