[libvirt PATCH] tests: Mock virGetUserRuntimeDirectory() for qemuhotplug

Michal Privoznik mprivozn at redhat.com
Mon May 4 11:44:29 UTC 2020


On 5/1/20 2:30 PM, Andrea Bolognani wrote:
> Not mocking this function results in files being created in the
> user's home directory when running the test and in the build
> failing altogether inside a constrained environment such as the
> one used by pbuilder:
> 
>    Could not initialize HostdevManager - operation failed: Failed
>    to create state dir '/nonexistent/.cache/libvirt/hostdevmgr'
> 
> Signed-off-by: Andrea Bolognani <abologna at redhat.com>
> ---
>   tests/qemuhotplugmock.c | 9 +++++++++
>   1 file changed, 9 insertions(+)
> 
> diff --git a/tests/qemuhotplugmock.c b/tests/qemuhotplugmock.c
> index d2324913cf..27c81670a3 100644
> --- a/tests/qemuhotplugmock.c
> +++ b/tests/qemuhotplugmock.c
> @@ -27,6 +27,7 @@
>   
>   static int (*real_virGetDeviceID)(const char *path, int *maj, int *min);
>   static bool (*real_virFileExists)(const char *path);
> +static char *(*real_virGetUserRuntimeDirectory)(void);
>   
>   static void
>   init_syms(void)
> @@ -36,6 +37,7 @@ init_syms(void)
>   
>       VIR_MOCK_REAL_INIT(virGetDeviceID);
>       VIR_MOCK_REAL_INIT(virFileExists);
> +    VIR_MOCK_REAL_INIT(virGetUserRuntimeDirectory);
>   }
>   
>   unsigned long long
> @@ -106,3 +108,10 @@ void
>   qemuProcessKillManagedPRDaemon(virDomainObjPtr vm G_GNUC_UNUSED)
>   {
>   }
> +
> +char *
> +virGetUserRuntimeDirectory(void)
> +{
> +    return g_build_filename(g_getenv("LIBVIRT_FAKE_ROOT_DIR"),
> +                            "user-runtime-directory", NULL);
> +}
> 

While the qemuhotplugtest is (currently) the only one that actually uses 
the runtimedir, this function is called basically from every qemu* test 
because (almost?) every qemu* test calls virQEMUDriverConfigNew(). 
Therefore I think we need to fix qemuTestDriverInit() too so that after 
it call ConfigNew() the path is replaced with some known value.

Michal




More information about the libvir-list mailing list