From 946958731420fc34b2e71c87ed879a050c36baf6 Mon Sep 17 00:00:00 2001
From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 3 May 2023 10:44:10 +0200
Subject: [PATCH] virfirewallmock: Replace virFindFileInPath() with
virFirewallDIsRegistered()
Neither of tests that use virfirewallmock.c
(networkxml2firewalltest, nwfilterebiptablestest,
nwfilterxml2firewalltest, virfirewalltest) really call
virFindFileInPath(). But at least networkxml2firewalltest calls
virFirewallDIsRegistered(), under the hood. Now, the actual
implementation connects to dbus and something, which is
definitely not what we want in our test suite.
Therefore, drop virFindFileInPath() implementation and provide
implementation for virFirewallDIsRegistered() which just returns
-2 to signal that firewalld is not registered.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Kristina Hanicova <khanicov@redhat.com>
---
tests/virfirewallmock.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/tests/virfirewallmock.c b/tests/virfirewallmock.c
index 6b096701c9..793b954d87 100644
--- a/tests/virfirewallmock.c
+++ b/tests/virfirewallmock.c
@@ -17,18 +17,10 @@
#include <config.h>
#include "internal.h"
-#include "virfile.h"
+#include "virfirewalld.h"
-char *
-virFindFileInPath(const char *file)
+int
+virFirewallDIsRegistered(void)
{
- if (file &&
- (g_strrstr(file, "ebtables") ||
- g_strrstr(file, "iptables") ||
- g_strrstr(file, "ip6tables"))) {
- return g_strdup(file);
- }
-
- /* We should not need any other binaries so return NULL. */
- return NULL;
+ return -2;
}