[libvirt] [PATCH] tests: Set up two more overrides for root builders

There are two more places after commit 3865941b that need to be adapted in order to get rid of some test failures when building as root. Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- tests/networkxml2firewalltest.c | 2 ++ tests/virfirewalltest.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c index 1225c44..c69ab54 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -135,6 +135,8 @@ mymain(void) ret = -1; \ } while (0) + virFirewallSetLockOverride(true); + if (virFirewallSetBackend(VIR_FIREWALL_BACKEND_DIRECT) < 0) { ret = -1; goto cleanup; diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index 81c5557..1f8d8f1 100644 --- a/tests/virfirewalltest.c +++ b/tests/virfirewalltest.c @@ -1168,6 +1168,8 @@ mymain(void) RUN_TEST_DIRECT(name, method) # endif /* ! WITH_DBUS */ + virFirewallSetLockOverride(true); + RUN_TEST("single group", testFirewallSingleGroup); RUN_TEST("remove rule", testFirewallRemoveRule); RUN_TEST("many groups", testFirewallManyGroups); -- 2.2.1

On 12/22/2014 10:13 PM, Martin Kletzander wrote:
There are two more places after commit 3865941b that need to be adapted in order to get rid of some test failures when building as root.
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- tests/networkxml2firewalltest.c | 2 ++ tests/virfirewalltest.c | 2 ++ 2 files changed, 4 insertions(+)
ACK. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

On 12/23/2014 12:13 AM, Martin Kletzander wrote:
There are two more places after commit 3865941b that need to be adapted in order to get rid of some test failures when building as root.
I would have patched it if I had seen the test failure -- I don't see a test failure on the tip - odd ? Stefan

On Tue, Dec 23, 2014 at 02:10:05PM -0500, Stefan Berger wrote:
On 12/23/2014 12:13 AM, Martin Kletzander wrote:
There are two more places after commit 3865941b that need to be adapted in order to get rid of some test failures when building as root.
I would have patched it if I had seen the test failure -- I don't see a test failure on the tip - odd ?
It is a little weird, but I've found this out on gentoo, not fedora, so it might be caused by different version of things or anything else. I was not looking for the root cause, but this fixes it and I also checked that these are all the tests that call virFirewallSetBackend(), so it should be fixed for others as well. Martin
participants (3)
-
Eric Blake
-
Martin Kletzander
-
Stefan Berger