Commit d0b63087 authored by Cleber Rosa's avatar Cleber Rosa
Browse files

Acceptance test x86_cpu_model_versions: fix mismatches between test and messages 



This fixes a few mismatches between the test and the error messages
produced in case of failures.

Signed-off-by: default avatarCleber Rosa <crosa@redhat.com>
Message-Id: <20190828193628.7687-3-crosa@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 1840326c

tests/acceptance/x86_cpu_model_versions.py

+3 −3
Original line number Diff line number Diff line
@@ -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')