[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/7] Acceptance test x86_cpu_model_versions: fix mismatches betwee
From: |
Cleber Rosa |
Subject: |
[PULL 3/7] Acceptance test x86_cpu_model_versions: fix mismatches between test and messages |
Date: |
Mon, 23 Sep 2019 09:40:15 -0400 |
This fixes a few mismatches between the test and the error messages
produced in case of failures.
Signed-off-by: Cleber Rosa <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
tests/acceptance/x86_cpu_model_versions.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/acceptance/x86_cpu_model_versions.py
b/tests/acceptance/x86_cpu_model_versions.py
index e6c76b0d4c..220d18f68d 100644
--- a/tests/acceptance/x86_cpu_model_versions.py
+++ b/tests/acceptance/x86_cpu_model_versions.py
@@ -280,7 +280,7 @@ class X86CPUModelAliases(avocado_qemu.Test):
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'),
- 'pc-i440fx-4.1 + Cascadelake-Server-v1 should not
have arch-capabilities')
+ 'pc-i440fx-4.0 + Cascadelake-Server-v1 should not
have arch-capabilities')
vm.shutdown()
vm = self.get_vm()
@@ -289,14 +289,14 @@ class X86CPUModelAliases(avocado_qemu.Test):
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.1 + Cascadelake-Server-v1 should have
arch-capabilities')
+ 'pc-i440fx-4.0 + Cascadelake-Server-v2 should have
arch-capabilities')
vm.shutdown()
# 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,x-force-features=on,check=off,enforce=off,+arch-capabilities')
+ 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')
--
2.21.0
- [PULL 0/7] Python (acceptance tests) queue - 2019-09-23, Cleber Rosa, 2019/09/23
- [PULL 1/7] Acceptance test machine_m68k_nextcube.py: relax the error code pattern, Cleber Rosa, 2019/09/23
- [PULL 2/7] Acceptance test x86_cpu_model_versions: shutdown VMs, Cleber Rosa, 2019/09/23
- [PULL 3/7] Acceptance test x86_cpu_model_versions: fix mismatches between test and messages,
Cleber Rosa <=
- [PULL 4/7] Acceptance test x86_cpu_model_versions: split into smaller tests, Cleber Rosa, 2019/09/23
- [PULL 5/7] tests/acceptance: Refactor and improve reporting in linux_ssh_mips_malta.py, Cleber Rosa, 2019/09/23
- [PULL 6/7] tests/acceptance: Add new test cases in linux_ssh_mips_malta.py, Cleber Rosa, 2019/09/23
- [PULL 7/7] Acceptance tests: use avocado.utils.ssh for SSH interaction, Cleber Rosa, 2019/09/23
- Re: [PULL 0/7] Python (acceptance tests) queue - 2019-09-23, no-reply, 2019/09/23
- Re: [PULL 0/7] Python (acceptance tests) queue - 2019-09-23, no-reply, 2019/09/23
- Re: [PULL 0/7] Python (acceptance tests) queue - 2019-09-23, no-reply, 2019/09/24
- Re: [PULL 0/7] Python (acceptance tests) queue - 2019-09-23, Peter Maydell, 2019/09/24