On Wed, Jan 22, 2020 at 2:28 AM Wainer dos Santos Moschetta
<wainersm@redhat.com> wrote:
>
> The Test._param_to_vm_args variable contain VM arguments that should be added
> at launch which were originated from test parameters. Use this variable
> to set -M from 'machine' parameter as well.
>
> Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
> ---
> tests/acceptance/avocado_qemu/__init__.py | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
> index c83a75ccbc..443ac02aff 100644
> --- a/tests/acceptance/avocado_qemu/__init__.py
> +++ b/tests/acceptance/avocado_qemu/__init__.py
> @@ -120,6 +120,8 @@ class Test(avocado.Test):
>
> self.machine = self.params.get('machine',
> default=self._get_unique_tag_val('machine'))
> + if self.machine:
> + self._param_to_vm_args.extend(['-M', self.machine])
>
> default_qemu_bin = pick_default_qemu_bin(arch=self.arch)
> self.qemu_bin = self.params.get('qemu_bin',
> @@ -162,8 +164,6 @@ class Test(avocado.Test):
> name = str(uuid.uuid4())
> if self._vms.get(name) is None:
> self._vms[name] = self._new_vm(*args)
> - if self.machine is not None:
> - self._vms[name].set_machine(self.machine)
> return self._vms[name]
>
> def tearDown(self):
> --
> 2.23.0
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>