Skip to content

memory_invalid_value: Add libvirt version-based test cancellation for 0 memory size numa node #6718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
liang-cong-red-hat wants to merge 1 commit into
base: master
Choose a base branch
from
Open

memory_invalid_value: Add libvirt version-based test cancellation for 0 memory size numa node #6718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion libvirt/tests/cfg/memory/memory_allocation/memory_invalid_value.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
max_mem_unit = 'KiB'
numa_mem = 1048576
start_vm = no
func_supported_since_libvirt_ver = (9, 0, 0)
variants num:
- zero:
value = 0
Expand All @@ -34,6 +33,9 @@
status_error = "yes"
- numa:
no s390-virtio
zero:
func_supported_since_libvirt_ver = (9, 0, 0)
func_not_supported_since_libvirt_ver = (11, 8, 0)
xpaths_list = [{'element_attrs':[".//cell[@id='0']"]}, {'element_attrs':[".//memory[@unit='${mem_unit}']"], 'text':'${numa_mem}'}, {'element_attrs':[".//currentMemory[@unit='${current_mem_unit}']"], 'text':'${numa_mem}'}]
vm_attrs = {'max_mem_rt': ${max_mem}, 'max_mem_rt_slots': ${max_mem_slots}, 'max_mem_rt_unit': "${max_mem_unit}",'memory_unit':"${mem_unit}",'memory':${mem_value},'current_mem':${current_mem},'current_mem_unit':'${current_mem_unit}','vcpu': 4,'cpu': {'numa_cell': [{'id': '0', 'cpus': '0-1', 'memory': '${value}', 'unit': 'KiB'},{'id':'1','cpus': '2-3','memory':'${numa_mem}','unit':'KiB'}]}}
start_vm_error = "yes"
Expand Down
7 changes: 5 additions & 2 deletions libvirt/tests/src/memory/memory_allocation/memory_invalid_value.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ def check_mem_config():
error_msg_2 = params.get("error_msg_2", "")
minus_error_msg = params.get("minus_error_msg", "")
start_error_msg = params.get("start_error_msg", "")
func_not_supported_since_libvirt_ver = eval(params.get("func_not_supported_since_libvirt_ver", "()"))

num = params.get("num")
mem_config = params.get("mem_config")
Expand All @@ -77,8 +78,10 @@ def check_mem_config():
start_vm_error = "yes" == params.get("start_vm_error", "no")

try:
if num == "zero" and mem_config == "numa":
libvirt_version.is_libvirt_feature_supported(params)
libvirt_version.is_libvirt_feature_supported(params)
if func_not_supported_since_libvirt_ver:
if libvirt_version.version_compare(*func_not_supported_since_libvirt_ver):
test.cancel("Test is not supported since libvirt version:%s" % str(func_not_supported_since_libvirt_ver))
setup_test()
run_test()

Expand Down