qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Cleber Rosa <crosa@redhat.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Cc: "Fam Zheng" <fam@euphon.net>, "Beraldo Leal" <bleal@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Fabien Chouteau" <chouteau@adacore.com>,
	"KONRAD Frederic" <frederic.konrad@adacore.com>,
	qemu-ppc@nongnu.org,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Willian Rampazzo" <wrampazz@redhat.com>,
	"Cleber Rosa" <crosa@redhat.com>,
	"Hervé Poussineau" <hpoussin@reactos.org>,
	"Aleksandar Rikalo" <aleksandar.rikalo@rt-rk.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Aurelien Jarno" <aurelien@aurel32.net>,
	"Eduardo Habkost" <ehabkost@redhat.com>
Subject: [PULL 08/15] Acceptance tests: introduce utility method for tags unique vals
Date: Tue, 17 Dec 2019 00:15:14 -0500	[thread overview]
Message-ID: <20191217051521.1239-9-crosa@redhat.com> (raw)
In-Reply-To: <20191217051521.1239-1-crosa@redhat.com>

Currently a test can describe the target architecture binary that it
should primarily be run with, be setting a single tag value.

The same approach is expected to be done with other QEMU aspects to be
tested, for instance, the machine type and accelerator, so let's
generalize the logic into a utility method.

Signed-off-by: Cleber Rosa <crosa@redhat.com>
Message-Id: <20190924194501.9303-3-crosa@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Cleber Rosa <crosa@redhat.com>
---
 tests/acceptance/avocado_qemu/__init__.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
index 9a57c020d8..e676d9c4e7 100644
--- a/tests/acceptance/avocado_qemu/__init__.py
+++ b/tests/acceptance/avocado_qemu/__init__.py
@@ -100,14 +100,21 @@ def exec_command_and_wait_for_pattern(test, command,
 
 
 class Test(avocado.Test):
+    def _get_unique_tag_val(self, tag_name):
+        """
+        Gets a tag value, if unique for a key
+        """
+        vals = self.tags.get(tag_name, [])
+        if len(vals) == 1:
+            return vals.pop()
+        return None
+
     def setUp(self):
         self._vms = {}
-        arches = self.tags.get('arch', [])
-        if len(arches) == 1:
-            arch = arches.pop()
-        else:
-            arch = None
-        self.arch = self.params.get('arch', default=arch)
+
+        self.arch = self.params.get('arch',
+                                    default=self._get_unique_tag_val('arch'))
+
         default_qemu_bin = pick_default_qemu_bin(arch=self.arch)
         self.qemu_bin = self.params.get('qemu_bin',
                                         default=default_qemu_bin)
-- 
2.21.0



  parent reply	other threads:[~2019-12-17  5:59 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-17  5:15 [PULL 00/15] Python queue 2019-12-17 Cleber Rosa
2019-12-17  5:15 ` [PULL 01/15] tests/boot_linux_console: Fetch assets from Debian snapshot archives Cleber Rosa
2019-12-17  5:15 ` [PULL 02/15] Revert "Acceptance test: cancel test if m68k kernel packages goes missing" Cleber Rosa
2019-12-17  5:15 ` [PULL 03/15] analyze-migration.py: fix find() type error Cleber Rosa
2019-12-17  5:15 ` [PULL 04/15] analyze-migration.py: replace numpy with python 3.2 Cleber Rosa
2019-12-17  5:15 ` [PULL 05/15] python/qemu: Add set_qmp_monitor() to QEMUMachine Cleber Rosa
2019-12-17  5:15 ` [PULL 06/15] tests/acceptance: Makes linux_initrd and empty_cpu_model use QEMUMachine Cleber Rosa
2019-12-17  5:15 ` [PULL 07/15] Acceptance test x86_cpu_model_versions: use default vm Cleber Rosa
2019-12-17  5:15 ` Cleber Rosa [this message]
2019-12-17  5:15 ` [PULL 09/15] Acceptance tests: use avocado tags for machine type Cleber Rosa
2019-12-17  5:15 ` [PULL 10/15] Acceptance tests: use relative location for tests Cleber Rosa
2019-12-17  5:15 ` [PULL 11/15] python/qemu: Move kvm_available() to its own module Cleber Rosa
2019-12-17  5:15 ` [PULL 12/15] python/qemu: accel: Add list_accel() method Cleber Rosa
2019-12-17  5:15 ` [PULL 13/15] python/qemu: accel: Strengthen kvm_available() checks Cleber Rosa
2019-12-17  5:15 ` [PULL 14/15] python/qemu: accel: Add tcg_available() method Cleber Rosa
2019-12-17  5:15 ` [PULL 15/15] python/qemu: Remove unneeded imports in __init__ Cleber Rosa
2019-12-17 15:27 ` [PULL 00/15] Python queue 2019-12-17 Peter Maydell

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=20191217051521.1239-9-crosa@redhat.com \
    --to=crosa@redhat.com \
    --cc=aleksandar.rikalo@rt-rk.com \
    --cc=alex.bennee@linaro.org \
    --cc=aurelien@aurel32.net \
    --cc=bleal@redhat.com \
    --cc=chouteau@adacore.com \
    --cc=ehabkost@redhat.com \
    --cc=fam@euphon.net \
    --cc=frederic.konrad@adacore.com \
    --cc=hpoussin@reactos.org \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --cc=wainersm@redhat.com \
    --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).