From: Wainer dos Santos Moschetta <wainersm@redhat.com>
To: qemu-devel@nongnu.org
Cc: wrampazz@redhat.com, philmd@redhat.com, pavel.dovgaluk@ispras.ru,
crosa@redhat.com, pbonzini@redhat.com, alex.bennee@linaro.org,
aurelien@aurel32.net
Subject: [PATCH v3 7/7] tests/acceptance: Handle cpu tag on x86_cpu_model_versions tests
Date: Fri, 30 Apr 2021 10:34:14 -0300 [thread overview]
Message-ID: <20210430133414.39905-8-wainersm@redhat.com> (raw)
In-Reply-To: <20210430133414.39905-1-wainersm@redhat.com>
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 <wainersm@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
next prev parent reply other threads:[~2021-04-30 13:53 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-30 13:34 [PATCH v3 0/7] tests/acceptance: Handle tests with "cpu" tag Wainer dos Santos Moschetta
2021-04-30 13:34 ` [PATCH v3 1/7] tests/acceptance: Automatic set -cpu to the test vm Wainer dos Santos Moschetta
2021-04-30 13:34 ` [PATCH v3 2/7] tests/acceptance: Fix mismatch on cpu tagged tests Wainer dos Santos Moschetta
2021-04-30 13:34 ` [PATCH v3 3/7] tests/acceptance: Let the framework handle "cpu:VALUE" " Wainer dos Santos Moschetta
2021-04-30 13:34 ` [PATCH v3 4/7] tests/acceptance: Tagging tests with "cpu:VALUE" Wainer dos Santos Moschetta
2021-04-30 13:34 ` [PATCH v3 5/7] python/qemu: Add args property to the QEMUMachine class Wainer dos Santos Moschetta
2021-04-30 13:34 ` [PATCH v3 6/7] tests/acceptance: Add set_vm_arg() to the Test class Wainer dos Santos Moschetta
2021-06-22 20:14 ` Willian Rampazzo
2021-04-30 13:34 ` Wainer dos Santos Moschetta [this message]
2021-06-22 20:18 ` [PATCH v3 7/7] tests/acceptance: Handle cpu tag on x86_cpu_model_versions tests Willian Rampazzo
2021-06-11 18:30 ` [PATCH v3 0/7] tests/acceptance: Handle tests with "cpu" tag Wainer dos Santos Moschetta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210430133414.39905-8-wainersm@redhat.com \
--to=wainersm@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=aurelien@aurel32.net \
--cc=crosa@redhat.com \
--cc=pavel.dovgaluk@ispras.ru \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=wrampazz@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).