mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 13:45:38 +00:00
vircgroupmock: Be wiser about detecting fakerootdir change
The way that vircgroupmock works is that the vircgrouptest creates a temporary directory and sets LIBVIRT_FAKE_ROOT_DIR env variable which is then checked by the mock at the beginning of basically every function it overrides (access(), stat in all its flavours, mkdir(), etc.). The mock then creates a CGroup dir structure. But the test is allowed to change the directory, to accommodate environment for the particular test case. This is done by changing the environment variable which is then detected by the mock and the whole process repeats. However, the way the mock detect changes is buggy. After it got the environment variable it compares it to the last known value (global variable @fakerootdir) and if they don't match the last known value is set to point to the new value. Problem is that the result of getenv() is assigned to the @fakerootdir directly. Therefore, @fakerootdir points somewhere into the buffer of environment variables. In turn, when the test sets new value (via g_setenv()) it may be placed at the very same position in the env var buffer and thus the mock fails to detect the change. The solution is to keep our private copy of the value (by g_strdup()) which makes the variable not rely on getenv()/setenv() placing values at random positions. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
20f1db2467
commit
61a12ffe08
@ -352,7 +352,8 @@ static void init_sysfs(void)
|
||||
if (fakerootdir && STREQ(fakerootdir, newfakerootdir))
|
||||
return;
|
||||
|
||||
fakerootdir = newfakerootdir;
|
||||
VIR_FREE(fakerootdir);
|
||||
fakerootdir = g_strdup(newfakerootdir);
|
||||
|
||||
mock = getenv("VIR_CGROUP_MOCK_MODE");
|
||||
if (mock) {
|
||||
|
Loading…
Reference in New Issue
Block a user