Some test cases on x86_cpu_model_versions.py are corner cases because they
need to pass extra options to the -cpu argument. Once the avocado_qemu
framework will set -cpu automatically, the value should be reset. This changed
those tests so to call set_vm_arg() to overwrite the -cpu value.
Signed-off-by: Wainer dos Santos Moschetta <waine...@redhat.com>
---
tests/acceptance/x86_cpu_model_versions.py | 40 +++++++++++++++++-----
1 file changed, 32 insertions(+), 8 deletions(-)
diff --git a/tests/acceptance/x86_cpu_model_versions.py
b/tests/acceptance/x86_cpu_model_versions.py
index 77ed8597a4..0e9feda62d 100644
--- a/tests/acceptance/x86_cpu_model_versions.py
+++ b/tests/acceptance/x86_cpu_model_versions.py
@@ -252,10 +252,13 @@ def get_cpu_prop(self, prop):
def test_4_1(self):
"""
:avocado: tags=machine:pc-i440fx-4.1
+ :avocado: tags=cpu:Cascadelake-Server
"""
# machine-type only:
self.vm.add_args('-S')
- self.vm.add_args('-cpu',
'Cascadelake-Server,x-force-features=on,check=off,enforce=off')
+ self.set_vm_arg('-cpu',
+ 'Cascadelake-Server,x-force-features=on,check=off,'
+ 'enforce=off')
self.vm.launch()
self.assertFalse(self.get_cpu_prop('arch-capabilities'),
'pc-i440fx-4.1 + Cascadelake-Server should not have
arch-capabilities')
@@ -263,9 +266,12 @@ def test_4_1(self):
def test_4_0(self):
"""
:avocado: tags=machine:pc-i440fx-4.0
+ :avocado: tags=cpu:Cascadelake-Server
"""
self.vm.add_args('-S')
- self.vm.add_args('-cpu',
'Cascadelake-Server,x-force-features=on,check=off,enforce=off')
+ self.set_vm_arg('-cpu',
+ 'Cascadelake-Server,x-force-features=on,check=off,'
+ 'enforce=off')
self.vm.launch()
self.assertFalse(self.get_cpu_prop('arch-capabilities'),
'pc-i440fx-4.0 + Cascadelake-Server should not have
arch-capabilities')
@@ -273,10 +279,13 @@ def test_4_0(self):
def test_set_4_0(self):
"""
:avocado: tags=machine:pc-i440fx-4.0
+ :avocado: tags=cpu:Cascadelake-Server
"""
# command line must override machine-type if CPU model is not
versioned:
self.vm.add_args('-S')
- self.vm.add_args('-cpu',
'Cascadelake-Server,x-force-features=on,check=off,enforce=off,+arch-capabilities')
+ self.set_vm_arg('-cpu',
+ 'Cascadelake-Server,x-force-features=on,check=off,'
+ 'enforce=off,+arch-capabilities')
self.vm.launch()
self.assertTrue(self.get_cpu_prop('arch-capabilities'),
'pc-i440fx-4.0 + Cascadelake-Server,+arch-capabilities
should have arch-capabilities')
@@ -284,9 +293,12 @@ def test_set_4_0(self):
def test_unset_4_1(self):
"""
:avocado: tags=machine:pc-i440fx-4.1
+ :avocado: tags=cpu:Cascadelake-Server
"""
self.vm.add_args('-S')
- self.vm.add_args('-cpu',
'Cascadelake-Server,x-force-features=on,check=off,enforce=off,-arch-capabilities')
+ self.set_vm_arg('-cpu',
+ 'Cascadelake-Server,x-force-features=on,check=off,'
+ 'enforce=off,-arch-capabilities')
self.vm.launch()
self.assertFalse(self.get_cpu_prop('arch-capabilities'),
'pc-i440fx-4.1 +
Cascadelake-Server,-arch-capabilities should not have arch-capabilities')
@@ -294,10 +306,13 @@ def test_unset_4_1(self):
def test_v1_4_0(self):
"""
:avocado: tags=machine:pc-i440fx-4.0
+ :avocado: tags=cpu:Cascadelake-Server
"""
# versioned CPU model overrides machine-type:
self.vm.add_args('-S')
- self.vm.add_args('-cpu',
'Cascadelake-Server-v1,x-force-features=on,check=off,enforce=off')
+ self.set_vm_arg('-cpu',
+ 'Cascadelake-Server-v1,x-force-features=on,check=off,'
+ 'enforce=off')
self.vm.launch()
self.assertFalse(self.get_cpu_prop('arch-capabilities'),
'pc-i440fx-4.0 + Cascadelake-Server-v1 should not
have arch-capabilities')
@@ -305,9 +320,12 @@ def test_v1_4_0(self):
def test_v2_4_0(self):
"""
:avocado: tags=machine:pc-i440fx-4.0
+ :avocado: tags=cpu:Cascadelake-Server
"""
self.vm.add_args('-S')
- self.vm.add_args('-cpu',
'Cascadelake-Server-v2,x-force-features=on,check=off,enforce=off')
+ self.set_vm_arg('-cpu',
+ 'Cascadelake-Server-v2,x-force-features=on,check=off,'
+ 'enforce=off')
self.vm.launch()
self.assertTrue(self.get_cpu_prop('arch-capabilities'),
'pc-i440fx-4.0 + Cascadelake-Server-v2 should have
arch-capabilities')
@@ -315,10 +333,13 @@ def test_v2_4_0(self):
def test_v1_set_4_0(self):
"""
:avocado: tags=machine:pc-i440fx-4.0
+ :avocado: tags=cpu:Cascadelake-Server
"""
# command line must override machine-type and versioned CPU model:
self.vm.add_args('-S')
- self.vm.add_args('-cpu',
'Cascadelake-Server-v1,x-force-features=on,check=off,enforce=off,+arch-capabilities')
+ self.set_vm_arg('-cpu',
+ 'Cascadelake-Server-v1,x-force-features=on,check=off,'
+ 'enforce=off,+arch-capabilities')
self.vm.launch()
self.assertTrue(self.get_cpu_prop('arch-capabilities'),
'pc-i440fx-4.0 +
Cascadelake-Server-v1,+arch-capabilities should have arch-capabilities')
@@ -326,9 +347,12 @@ def test_v1_set_4_0(self):
def test_v2_unset_4_1(self):
"""
:avocado: tags=machine:pc-i440fx-4.1
+ :avocado: tags=cpu:Cascadelake-Server
"""
self.vm.add_args('-S')
- self.vm.add_args('-cpu',
'Cascadelake-Server-v2,x-force-features=on,check=off,enforce=off,-arch-capabilities')
+ self.set_vm_arg('-cpu',
+ 'Cascadelake-Server-v2,x-force-features=on,check=off,'
+ 'enforce=off,-arch-capabilities')
self.vm.launch()
self.assertFalse(self.get_cpu_prop('arch-capabilities'),
'pc-i440fx-4.1 +
Cascadelake-Server-v2,-arch-capabilities should not have arch-capabilities')
--
2.29.2
