dsg/cloud-hypervisor
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests: integration: expect some ksm merged pages

Browse source 
Our CI test execution system finds some mergeable pages in the system
directly on boot since a recent update. Remove the broken assumption in
the test_memory_mergeable integration test and only check if the guest
VMs influence the shared pages count.

Signed-off-by: Stefan Nürnberger <stefan.nuernberger@cyberus-technology.de>
This commit is contained in:
Stefan Nürnberger 2025-12-09 19:58:02 +01:00 • committed by Rob Bradford
parent 41a8dcd9ba
commit 4592f37bcf
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cloud-hypervisor/tests/integration.rs
View file

@ -1955,9 +1955,8 @@ fn test_memory_mergeable(mergeable: bool) {
"mergeable=off"
};
// We are assuming the rest of the system in our CI is not using mergeable memory
// We assume the number of shared pages in the rest of the system to be constant
let ksm_ps_init = get_ksm_pages_shared();
assert!(ksm_ps_init == 0);
let disk_config1 = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
let guest1 = Guest::new(Box::new(disk_config1));
@ -2010,8 +2009,8 @@ fn test_memory_mergeable(mergeable: bool) {
// We are expecting the number of shared pages to increase as the number of VM increases
assert!(ksm_ps_guest1 < ksm_ps_guest2);
} else {
assert!(ksm_ps_guest1 == 0);
assert!(ksm_ps_guest2 == 0);
assert!(ksm_ps_guest1 == ksm_ps_init);
assert!(ksm_ps_guest2 == ksm_ps_init);
}
});