Re: [libvirt PATCH v2 1/1] tests: Introduce virhostdevmock

We need this for all tests that use virHostdevManager, because during creation of this object for unprivileged connections like those used in the test suite we would end up writing inside the user's home directory. That's bad manners in general, but when running the test suite inside a purposefully constrained environment such as the one exposed by pbuilder, it turns into an outright test failure: Could not initialize HostdevManager - operation failed: Failed to create state dir '/nonexistent/.cache/libvirt/hostdevmgr' Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- tests/Makefile.am | 7 +++++++ tests/qemuhotplugtest.c | 1 + tests/virhostdevmock.c | 29 +++++++++++++++++++++++++++++ tests/virhostdevtest.c | 4 +++- 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 tests/virhostdevmock.c diff --git a/tests/Makefile.am b/tests/Makefile.am index ada5b8fc57..fc516376b4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -212,6 +212,7 @@ test_libraries = libshunload.la \ libvirnetdaemonmock.la \ libvirnetserverclientmock.la \ libvircgroupmock.la \ + libvirhostdevmock.la \ libvirpcimock.la \ libvirnetdevmock.la \ libvirrandommock.la \ @@ -1226,6 +1227,12 @@ libvirfilecachemock_la_SOURCES = \ libvirfilecachemock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) libvirfilecachemock_la_LIBADD = $(MOCKLIBS_LIBS) +libvirhostdevmock_la_SOURCES = \ + virhostdevmock.c \ + $(NULL) +libvirhostdevmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) +libvirhostdevmock_la_LIBADD = $(MOCKLIBS_LIBS) + if WITH_LINUX vircaps2xmltest_SOURCES = \ vircaps2xmltest.c testutils.h testutils.c virfilewrapper.h virfilewrapper.c diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 9a215ab303..cf87de187f 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -900,6 +900,7 @@ mymain(void) } VIR_TEST_MAIN_PRELOAD(mymain, + VIR_TEST_MOCK("virhostdev"), VIR_TEST_MOCK("virpci"), VIR_TEST_MOCK("domaincaps"), VIR_TEST_MOCK("virprocess"), diff --git a/tests/virhostdevmock.c b/tests/virhostdevmock.c new file mode 100644 index 0000000000..8658d9affd --- /dev/null +++ b/tests/virhostdevmock.c @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2020 Red Hat, Inc. + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + +#include <config.h> + +#include "virutil.h" +#include "virmock.h" + +static char *(*real_virGetUserRuntimeDirectory)(void);