public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Cleber Rosa <crosa@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
	"Thomas Huth" <thuth@redhat.com>,
	"Beraldo Leal" <bleal@redhat.com>,
	"Sriram Yagnaraman" <sriram.yagnaraman@ericsson.com>,
	"David Woodhouse" <dwmw2@infradead.org>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Leif Lindholm" <quic_llindhol@quicinc.com>,
	"Jiaxun Yang" <jiaxun.yang@flygoat.com>,
	kvm@vger.kernel.org, "Alex Bennée" <alex.bennee@linaro.org>,
	"Marcin Juszkiewicz" <marcin.juszkiewicz@linaro.org>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	qemu-arm@nongnu.org, "Radoslaw Biernacki" <rad@semihalf.com>,
	"Cleber Rosa" <crosa@redhat.com>, "Paul Durrant" <paul@xen.org>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Akihiko Odaki" <akihiko.odaki@daynix.com>
Subject: [PATCH 02/13] tests/avocado: mips: add hint for fetchasset plugin
Date: Fri, 26 Jul 2024 09:44:27 -0400	[thread overview]
Message-ID: <20240726134438.14720-3-crosa@redhat.com> (raw)
In-Reply-To: <20240726134438.14720-1-crosa@redhat.com>

Avocado's fetchasset plugin runs before the actual Avocado job (and
any test).  It analyses the test's code looking for occurrences of
"self.fetch_asset()" in the either the actual test or setUp() method.
It's not able to fully analyze all code, though.

The way these tests are written, make the fetchasset plugin blind to
the assets.  This adds some more code duplication, true, but it will
aid the fetchasset plugin to download or verify the existence of these
assets in advance.

Signed-off-by: Cleber Rosa <crosa@redhat.com>
---
 tests/avocado/boot_linux_console.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py
index 450d67be6a..b8b0a4df10 100644
--- a/tests/avocado/boot_linux_console.py
+++ b/tests/avocado/boot_linux_console.py
@@ -274,8 +274,7 @@ def test_mips64el_malta_5KEc_cpio(self):
         # Wait for VM to shut down gracefully
         self.vm.wait()
 
-    def do_test_mips_malta32el_nanomips(self, kernel_url, kernel_hash):
-        kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
+    def do_test_mips_malta32el_nanomips(self, kernel_path_xz):
         kernel_path = self.workdir + "kernel"
         with lzma.open(kernel_path_xz, 'rb') as f_in:
             with open(kernel_path, 'wb') as f_out:
@@ -303,7 +302,8 @@ def test_mips_malta32el_nanomips_4k(self):
                       'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/'
                       'generic_nano32r6el_page4k.xz')
         kernel_hash = '477456aafd2a0f1ddc9482727f20fe9575565dd6'
-        self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash)
+        kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
+        self.do_test_mips_malta32el_nanomips(kernel_path_xz)
 
     def test_mips_malta32el_nanomips_16k_up(self):
         """
@@ -316,7 +316,8 @@ def test_mips_malta32el_nanomips_16k_up(self):
                       'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/'
                       'generic_nano32r6el_page16k_up.xz')
         kernel_hash = 'e882868f944c71c816e832e2303b7874d044a7bc'
-        self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash)
+        kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
+        self.do_test_mips_malta32el_nanomips(kernel_path_xz)
 
     def test_mips_malta32el_nanomips_64k_dbg(self):
         """
@@ -329,7 +330,8 @@ def test_mips_malta32el_nanomips_64k_dbg(self):
                       'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/'
                       'generic_nano32r6el_page64k_dbg.xz')
         kernel_hash = '18d1c68f2e23429e266ca39ba5349ccd0aeb7180'
-        self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash)
+        kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
+        self.do_test_mips_malta32el_nanomips(kernel_path_xz)
 
     def test_aarch64_xlnx_versal_virt(self):
         """
-- 
2.45.2


  parent reply	other threads:[~2024-07-26 13:45 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-26 13:44 [PATCH 00/13] Bump Avocado to 103.0 LTS and update tests for compatibility and new features Cleber Rosa
2024-07-26 13:44 ` [PATCH 01/13] tests/avocado: mips: fallback to HTTP given certificate expiration Cleber Rosa
2024-07-29 11:49   ` Philippe Mathieu-Daudé
2024-07-26 13:44 ` Cleber Rosa [this message]
2024-07-29 13:31   ` [PATCH 02/13] tests/avocado: mips: add hint for fetchasset plugin Philippe Mathieu-Daudé
2024-07-26 13:44 ` [PATCH 03/13] tests/avocado/intel_iommu.py: increase timeout Cleber Rosa
2024-07-29 10:30   ` Daniel P. Berrangé
2024-08-01  1:02     ` Cleber Rosa
2024-08-12  7:33       ` Eric Auger
2024-07-26 13:44 ` [PATCH 04/13] tests/avocado: add cdrom permission related tests Cleber Rosa
2024-07-26 13:44 ` [PATCH 05/13] tests/avocado: machine aarch64: standardize location and RO access Cleber Rosa
2024-07-29 10:34   ` Daniel P. Berrangé
2024-07-29 11:54     ` Cleber Rosa
2024-07-26 13:44 ` [PATCH 06/13] tests/avocado: use more distinct names for assets Cleber Rosa
2024-07-29 10:49   ` Daniel P. Berrangé
2024-07-29 11:54     ` Philippe Mathieu-Daudé
2024-08-01  3:20       ` Cleber Rosa
2024-08-01  3:12     ` Cleber Rosa
2024-08-01 16:05       ` Alex Bennée
2024-07-26 13:44 ` [PATCH 07/13] tests/avocado/kvm_xen_guest.py: cope with asset RW requirements Cleber Rosa
2024-07-29 10:58   ` Daniel P. Berrangé
2024-07-29 12:03     ` David Woodhouse
2024-08-01 14:26       ` Alex Bennée
2024-08-01 15:39         ` Cleber Rosa
2024-07-26 13:44 ` [PATCH 08/13] testa/avocado: test_arm_emcraft_sf2: handle RW requirements for asset Cleber Rosa
2024-07-29 10:59   ` Daniel P. Berrangé
2024-07-26 13:44 ` [PATCH 09/13] tests/avocado/boot_xen.py: fetch kernel during test setUp() Cleber Rosa
2024-07-29 11:01   ` Daniel P. Berrangé
2024-08-01  3:24     ` Cleber Rosa
2024-07-26 13:44 ` [PATCH 10/13] tests/avocado/tuxrun_baselines.py: use Avocado's zstd support Cleber Rosa
2024-07-29 11:02   ` Daniel P. Berrangé
2024-07-29 14:39   ` Philippe Mathieu-Daudé
2024-08-01  3:39     ` Cleber Rosa
2024-08-01 12:59       ` Philippe Mathieu-Daudé
2024-08-01 15:18         ` Cleber Rosa
2024-07-26 13:44 ` [PATCH 11/13] tests/avocado/machine_aarch64_sbsaref.py: allow for rw usage of image Cleber Rosa
2024-07-29 11:05   ` Daniel P. Berrangé
2024-07-26 13:44 ` [PATCH 12/13] Bump avocado to 103.0 Cleber Rosa
2024-07-29 11:08   ` Daniel P. Berrangé
2024-07-29 12:02   ` Philippe Mathieu-Daudé
2024-08-01  0:48     ` Cleber Rosa
2024-07-26 13:44 ` [PATCH 13/13] Avocado tests: allow for parallel execution of tests Cleber Rosa
2024-07-28 15:27 ` [PATCH 00/13] Bump Avocado to 103.0 LTS and update tests for compatibility and new features Akihiko Odaki
2024-07-29 14:40 ` Philippe Mathieu-Daudé

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=20240726134438.14720-3-crosa@redhat.com \
    --to=crosa@redhat.com \
    --cc=akihiko.odaki@daynix.com \
    --cc=alex.bennee@linaro.org \
    --cc=bleal@redhat.com \
    --cc=dwmw2@infradead.org \
    --cc=jiaxun.yang@flygoat.com \
    --cc=kvm@vger.kernel.org \
    --cc=marcin.juszkiewicz@linaro.org \
    --cc=paul@xen.org \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=quic_llindhol@quicinc.com \
    --cc=rad@semihalf.com \
    --cc=sriram.yagnaraman@ericsson.com \
    --cc=thuth@redhat.com \
    --cc=wainersm@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