From ec0db69c86247166f83f0f8f7c928e031a3a26d1 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 23 Jan 2020 13:23:35 +0100 Subject: [PATCH] tests: qemu: Don't add fake machine types when testing with real data Skip the step of adding all of the fake machine types which are required for the legacy tests in case when we are testing with real capabilities. Faking any data in the real capabilities undermines the point of testing with real capabilities. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/testutilsqemu.c | 46 +++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 10f1138bca..d44548f795 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -332,28 +332,32 @@ int qemuTestCapsCacheInsert(virFileCachePtr cache, } else { tmpCaps = virQEMUCapsNew(); } - virQEMUCapsSetArch(tmpCaps, i); - for (j = 0; qemu_machines[i][j] != NULL; j++) { - virQEMUCapsAddMachine(tmpCaps, - VIR_DOMAIN_VIRT_QEMU, - qemu_machines[i][j], - NULL, - NULL, - 0, - false, - false); - } - for (j = 0; kvm_machines[i][j] != NULL; j++) { - virQEMUCapsAddMachine(tmpCaps, - VIR_DOMAIN_VIRT_KVM, - kvm_machines[i][j], - NULL, - NULL, - 0, - false, - false); - virQEMUCapsSet(tmpCaps, QEMU_CAPS_KVM); + + if (!virQEMUCapsHasMachines(tmpCaps)) { + virQEMUCapsSetArch(tmpCaps, i); + for (j = 0; qemu_machines[i][j] != NULL; j++) { + virQEMUCapsAddMachine(tmpCaps, + VIR_DOMAIN_VIRT_QEMU, + qemu_machines[i][j], + NULL, + NULL, + 0, + false, + false); + } + for (j = 0; kvm_machines[i][j] != NULL; j++) { + virQEMUCapsAddMachine(tmpCaps, + VIR_DOMAIN_VIRT_KVM, + kvm_machines[i][j], + NULL, + NULL, + 0, + false, + false); + virQEMUCapsSet(tmpCaps, QEMU_CAPS_KVM); + } } + if (virFileCacheInsertData(cache, qemu_emulators[i], tmpCaps) < 0) { virObjectUnref(tmpCaps); return -1;