mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-21 20:15:17 +00:00
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>
This commit is contained in:
parent
c033377a17
commit
9469587314
@ -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;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user