| Message ID | 20191104151323.9883-2-crosa@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Acceptance test: Add "boot_linux" acceptance test | expand |
On 11/4/19 4:13 PM, Cleber Rosa wrote: > The default vm provided by the test, available as self.vm, serves the > same purpose of the one obtained by self.get_vm(), but saves a line > and matches the style of other tests. > > Signed-off-by: Cleber Rosa <crosa@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > tests/acceptance/x86_cpu_model_versions.py | 100 ++++++++++----------- > 1 file changed, 46 insertions(+), 54 deletions(-) > > diff --git a/tests/acceptance/x86_cpu_model_versions.py b/tests/acceptance/x86_cpu_model_versions.py > index 5fc9ca4bc6..6eb977954d 100644 > --- a/tests/acceptance/x86_cpu_model_versions.py > +++ b/tests/acceptance/x86_cpu_model_versions.py > @@ -25,10 +25,6 @@ > import avocado_qemu > import re > > -def get_cpu_prop(vm, prop): > - cpu_path = vm.command('query-cpus')[0].get('qom_path') > - return vm.command('qom-get', path=cpu_path, property=prop) > - > class X86CPUModelAliases(avocado_qemu.Test): > """ > Validation of PC CPU model versions and CPU model aliases > @@ -241,78 +237,74 @@ class CascadelakeArchCapabilities(avocado_qemu.Test): > > :avocado: tags=arch:x86_64 > """ > + def get_cpu_prop(self, prop): > + cpu_path = self.vm.command('query-cpus')[0].get('qom_path') > + return self.vm.command('qom-get', path=cpu_path, property=prop) > + > def test_4_1(self): > # machine-type only: > - vm = self.get_vm() > - vm.add_args('-S') > - vm.set_machine('pc-i440fx-4.1') > - vm.add_args('-cpu', 'Cascadelake-Server,x-force-features=on,check=off,enforce=off') > - vm.launch() > - self.assertFalse(get_cpu_prop(vm, 'arch-capabilities'), > + self.vm.add_args('-S') > + self.vm.set_machine('pc-i440fx-4.1') > + self.vm.add_args('-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') > > def test_4_0(self): > - vm = self.get_vm() > - vm.add_args('-S') > - vm.set_machine('pc-i440fx-4.0') > - vm.add_args('-cpu', 'Cascadelake-Server,x-force-features=on,check=off,enforce=off') > - vm.launch() > - self.assertFalse(get_cpu_prop(vm, 'arch-capabilities'), > + self.vm.add_args('-S') > + self.vm.set_machine('pc-i440fx-4.0') > + self.vm.add_args('-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') > > def test_set_4_0(self): > # command line must override machine-type if CPU model is not versioned: > - vm = self.get_vm() > - vm.add_args('-S') > - vm.set_machine('pc-i440fx-4.0') > - vm.add_args('-cpu', 'Cascadelake-Server,x-force-features=on,check=off,enforce=off,+arch-capabilities') > - vm.launch() > - self.assertTrue(get_cpu_prop(vm, 'arch-capabilities'), > + self.vm.add_args('-S') > + self.vm.set_machine('pc-i440fx-4.0') > + self.vm.add_args('-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') > > def test_unset_4_1(self): > - vm = self.get_vm() > - vm.add_args('-S') > - vm.set_machine('pc-i440fx-4.1') > - vm.add_args('-cpu', 'Cascadelake-Server,x-force-features=on,check=off,enforce=off,-arch-capabilities') > - vm.launch() > - self.assertFalse(get_cpu_prop(vm, 'arch-capabilities'), > + self.vm.add_args('-S') > + self.vm.set_machine('pc-i440fx-4.1') > + self.vm.add_args('-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') > > def test_v1_4_0(self): > # versioned CPU model overrides machine-type: > - vm = self.get_vm() > - vm.add_args('-S') > - vm.set_machine('pc-i440fx-4.0') > - vm.add_args('-cpu', 'Cascadelake-Server-v1,x-force-features=on,check=off,enforce=off') > - vm.launch() > - self.assertFalse(get_cpu_prop(vm, 'arch-capabilities'), > + self.vm.add_args('-S') > + self.vm.set_machine('pc-i440fx-4.0') > + self.vm.add_args('-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') > > def test_v2_4_0(self): > - vm = self.get_vm() > - vm.add_args('-S') > - vm.set_machine('pc-i440fx-4.0') > - vm.add_args('-cpu', 'Cascadelake-Server-v2,x-force-features=on,check=off,enforce=off') > - vm.launch() > - self.assertTrue(get_cpu_prop(vm, 'arch-capabilities'), > - 'pc-i440fx-4.0 + Cascadelake-Server-v2 should have arch-capabilities') > + self.vm.add_args('-S') > + self.vm.set_machine('pc-i440fx-4.0') > + self.vm.add_args('-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') > > def test_v1_set_4_0(self): > # command line must override machine-type and versioned CPU model: > - vm = self.get_vm() > - vm.add_args('-S') > - vm.set_machine('pc-i440fx-4.0') > - vm.add_args('-cpu', 'Cascadelake-Server-v1,x-force-features=on,check=off,enforce=off,+arch-capabilities') > - vm.launch() > - self.assertTrue(get_cpu_prop(vm, 'arch-capabilities'), > - 'pc-i440fx-4.0 + Cascadelake-Server-v1,+arch-capabilities should have arch-capabilities') > + self.vm.add_args('-S') > + self.vm.set_machine('pc-i440fx-4.0') > + self.vm.add_args('-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') > > def test_v2_unset_4_1(self): > - vm = self.get_vm() > - vm.add_args('-S') > - vm.set_machine('pc-i440fx-4.1') > - vm.add_args('-cpu', 'Cascadelake-Server-v2,x-force-features=on,check=off,enforce=off,-arch-capabilities') > - vm.launch() > - self.assertFalse(get_cpu_prop(vm, 'arch-capabilities'), > + self.vm.add_args('-S') > + self.vm.set_machine('pc-i440fx-4.1') > + self.vm.add_args('-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') >
diff --git a/tests/acceptance/x86_cpu_model_versions.py b/tests/acceptance/x86_cpu_model_versions.py index 5fc9ca4bc6..6eb977954d 100644 --- a/tests/acceptance/x86_cpu_model_versions.py +++ b/tests/acceptance/x86_cpu_model_versions.py @@ -25,10 +25,6 @@ import avocado_qemu import re -def get_cpu_prop(vm, prop): - cpu_path = vm.command('query-cpus')[0].get('qom_path') - return vm.command('qom-get', path=cpu_path, property=prop) - class X86CPUModelAliases(avocado_qemu.Test): """ Validation of PC CPU model versions and CPU model aliases @@ -241,78 +237,74 @@ class CascadelakeArchCapabilities(avocado_qemu.Test): :avocado: tags=arch:x86_64 """ + def get_cpu_prop(self, prop): + cpu_path = self.vm.command('query-cpus')[0].get('qom_path') + return self.vm.command('qom-get', path=cpu_path, property=prop) + def test_4_1(self): # machine-type only: - vm = self.get_vm() - vm.add_args('-S') - vm.set_machine('pc-i440fx-4.1') - vm.add_args('-cpu', 'Cascadelake-Server,x-force-features=on,check=off,enforce=off') - vm.launch() - self.assertFalse(get_cpu_prop(vm, 'arch-capabilities'), + self.vm.add_args('-S') + self.vm.set_machine('pc-i440fx-4.1') + self.vm.add_args('-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') def test_4_0(self): - vm = self.get_vm() - vm.add_args('-S') - vm.set_machine('pc-i440fx-4.0') - vm.add_args('-cpu', 'Cascadelake-Server,x-force-features=on,check=off,enforce=off') - vm.launch() - self.assertFalse(get_cpu_prop(vm, 'arch-capabilities'), + self.vm.add_args('-S') + self.vm.set_machine('pc-i440fx-4.0') + self.vm.add_args('-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') def test_set_4_0(self): # command line must override machine-type if CPU model is not versioned: - vm = self.get_vm() - vm.add_args('-S') - vm.set_machine('pc-i440fx-4.0') - vm.add_args('-cpu', 'Cascadelake-Server,x-force-features=on,check=off,enforce=off,+arch-capabilities') - vm.launch() - self.assertTrue(get_cpu_prop(vm, 'arch-capabilities'), + self.vm.add_args('-S') + self.vm.set_machine('pc-i440fx-4.0') + self.vm.add_args('-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') def test_unset_4_1(self): - vm = self.get_vm() - vm.add_args('-S') - vm.set_machine('pc-i440fx-4.1') - vm.add_args('-cpu', 'Cascadelake-Server,x-force-features=on,check=off,enforce=off,-arch-capabilities') - vm.launch() - self.assertFalse(get_cpu_prop(vm, 'arch-capabilities'), + self.vm.add_args('-S') + self.vm.set_machine('pc-i440fx-4.1') + self.vm.add_args('-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') def test_v1_4_0(self): # versioned CPU model overrides machine-type: - vm = self.get_vm() - vm.add_args('-S') - vm.set_machine('pc-i440fx-4.0') - vm.add_args('-cpu', 'Cascadelake-Server-v1,x-force-features=on,check=off,enforce=off') - vm.launch() - self.assertFalse(get_cpu_prop(vm, 'arch-capabilities'), + self.vm.add_args('-S') + self.vm.set_machine('pc-i440fx-4.0') + self.vm.add_args('-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') def test_v2_4_0(self): - vm = self.get_vm() - vm.add_args('-S') - vm.set_machine('pc-i440fx-4.0') - vm.add_args('-cpu', 'Cascadelake-Server-v2,x-force-features=on,check=off,enforce=off') - vm.launch() - self.assertTrue(get_cpu_prop(vm, 'arch-capabilities'), - 'pc-i440fx-4.0 + Cascadelake-Server-v2 should have arch-capabilities') + self.vm.add_args('-S') + self.vm.set_machine('pc-i440fx-4.0') + self.vm.add_args('-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') def test_v1_set_4_0(self): # command line must override machine-type and versioned CPU model: - vm = self.get_vm() - vm.add_args('-S') - vm.set_machine('pc-i440fx-4.0') - vm.add_args('-cpu', 'Cascadelake-Server-v1,x-force-features=on,check=off,enforce=off,+arch-capabilities') - vm.launch() - self.assertTrue(get_cpu_prop(vm, 'arch-capabilities'), - 'pc-i440fx-4.0 + Cascadelake-Server-v1,+arch-capabilities should have arch-capabilities') + self.vm.add_args('-S') + self.vm.set_machine('pc-i440fx-4.0') + self.vm.add_args('-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') def test_v2_unset_4_1(self): - vm = self.get_vm() - vm.add_args('-S') - vm.set_machine('pc-i440fx-4.1') - vm.add_args('-cpu', 'Cascadelake-Server-v2,x-force-features=on,check=off,enforce=off,-arch-capabilities') - vm.launch() - self.assertFalse(get_cpu_prop(vm, 'arch-capabilities'), + self.vm.add_args('-S') + self.vm.set_machine('pc-i440fx-4.1') + self.vm.add_args('-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')
The default vm provided by the test, available as self.vm, serves the same purpose of the one obtained by self.get_vm(), but saves a line and matches the style of other tests. Signed-off-by: Cleber Rosa <crosa@redhat.com> --- tests/acceptance/x86_cpu_model_versions.py | 100 ++++++++++----------- 1 file changed, 46 insertions(+), 54 deletions(-)