mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-25 10:03:49 +03:00
tests: Fix libxlxml2domconfigtest
Downstream CI recently encountered failures of libxlxml2domconfigtest when building libvirt packages against Xen 4.17 rc3 packages. The test fails on vnuma_hvm config, where suddently the actual json produced by libxl_domain_config_to_json() contains a 'pnode' entry in the 'vnuma_nodes' list, which is absent in the expected json. It appears the test has thus far passed by luck. E.g. I was able to make the test pass in the failing environment by changing the meson buildtype from debugoptimized to debug. When a VM config contains vnuma settings, libxlMakeVnumaList() checks if the number of requested vnuma nodes exceeds the number of physical nodes. The number of physical nodes is retrieved with libxl_get_physinfo(), which can return wildly different results in the context of unit tests. This change mocks libxl_get_physinfo() to return consistent results. All fields of the libxl_physinfo struct are set to 0 except nr_nodes, which is set to 6 to ensure the vnuma_hvm configuration is properly tested. Signed-off-by: Jim Fehlig <jfehlig@suse.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
ddb1bc0519
commit
f81ee7b549
@ -70,6 +70,21 @@ VIR_MOCK_IMPL_RET_ARGS(libxl_get_version_info,
|
|||||||
return &info;
|
return &info;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
VIR_MOCK_IMPL_RET_ARGS(libxl_get_physinfo,
|
||||||
|
int,
|
||||||
|
libxl_ctx *, ctx,
|
||||||
|
libxl_physinfo *, physinfo)
|
||||||
|
{
|
||||||
|
memset(physinfo, 0, sizeof(*physinfo));
|
||||||
|
physinfo->nr_nodes = 6;
|
||||||
|
|
||||||
|
/* silence gcc warning about unused function */
|
||||||
|
if (0)
|
||||||
|
real_libxl_get_physinfo(ctx, physinfo);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
VIR_MOCK_STUB_RET_ARGS(libxl_get_free_memory,
|
VIR_MOCK_STUB_RET_ARGS(libxl_get_free_memory,
|
||||||
int, 0,
|
int, 0,
|
||||||
libxl_ctx *, ctx,
|
libxl_ctx *, ctx,
|
||||||
|
@ -39,6 +39,7 @@
|
|||||||
41,
|
41,
|
||||||
51
|
51
|
||||||
],
|
],
|
||||||
|
"pnode": 1,
|
||||||
"vcpus": [
|
"vcpus": [
|
||||||
1
|
1
|
||||||
]
|
]
|
||||||
@ -53,6 +54,7 @@
|
|||||||
31,
|
31,
|
||||||
41
|
41
|
||||||
],
|
],
|
||||||
|
"pnode": 2,
|
||||||
"vcpus": [
|
"vcpus": [
|
||||||
2
|
2
|
||||||
]
|
]
|
||||||
@ -67,6 +69,7 @@
|
|||||||
21,
|
21,
|
||||||
31
|
31
|
||||||
],
|
],
|
||||||
|
"pnode": 3,
|
||||||
"vcpus": [
|
"vcpus": [
|
||||||
3
|
3
|
||||||
]
|
]
|
||||||
@ -81,6 +84,7 @@
|
|||||||
10,
|
10,
|
||||||
21
|
21
|
||||||
],
|
],
|
||||||
|
"pnode": 4,
|
||||||
"vcpus": [
|
"vcpus": [
|
||||||
4
|
4
|
||||||
]
|
]
|
||||||
@ -95,6 +99,7 @@
|
|||||||
21,
|
21,
|
||||||
10
|
10
|
||||||
],
|
],
|
||||||
|
"pnode": 5,
|
||||||
"vcpus": [
|
"vcpus": [
|
||||||
5
|
5
|
||||||
]
|
]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user