| Message ID | 20231208190911.102879-3-crosa@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | for-8.3 tests/avocado: prep for Avocado 103.0 LTS | expand |
On 2023/12/09 4:09, Cleber Rosa wrote: > 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 redundant code, true, but one that doesn't hurt > the test and aids the fetchasset plugin to download or verify the > existence of these assets in advance. > > Signed-off-by: Cleber Rosa <crosa@redhat.com> Why not delete fetch_asset() in do_test_mips_malta32el_nanomips()?
Akihiko Odaki <akihiko.odaki@daynix.com> writes: > On 2023/12/09 4:09, Cleber Rosa wrote: >> 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 redundant code, true, but one that doesn't hurt >> the test and aids the fetchasset plugin to download or verify the >> existence of these assets in advance. >> >> Signed-off-by: Cleber Rosa <crosa@redhat.com> > > Why not delete fetch_asset() in do_test_mips_malta32el_nanomips()? I was trying to preserve do_test_mips_malta32el_nanomips() in such a way that with the eventual migration to the "dependency" system in newer Avocado, the lines added here could simply be reversed. But, that's not a strong enough reason to justify the duplication. I'll follow your suggestion on v2. Thanks! - Cleber.
diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py index 8066861c17..f5c5d647a4 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -303,6 +303,11 @@ def test_mips_malta32el_nanomips_4k(self): 'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/' 'generic_nano32r6el_page4k.xz') kernel_hash = '477456aafd2a0f1ddc9482727f20fe9575565dd6' + + # The following line is a no-op that aids the avocado + # fetchasset plugin that runs before any portion of the test + self.fetch_asset(kernel_url, asset_hash=kernel_hash) + self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash) def test_mips_malta32el_nanomips_16k_up(self): @@ -316,6 +321,11 @@ def test_mips_malta32el_nanomips_16k_up(self): 'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/' 'generic_nano32r6el_page16k_up.xz') kernel_hash = 'e882868f944c71c816e832e2303b7874d044a7bc' + + # The following line is a no-op that aids the avocado + # fetchasset plugin that runs before any portion of the test + self.fetch_asset(kernel_url, asset_hash=kernel_hash) + self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash) def test_mips_malta32el_nanomips_64k_dbg(self): @@ -329,6 +339,11 @@ def test_mips_malta32el_nanomips_64k_dbg(self): 'kernels/v4.15.18-432-gb2eb9a8b07a1-20180627102142/' 'generic_nano32r6el_page64k_dbg.xz') kernel_hash = '18d1c68f2e23429e266ca39ba5349ccd0aeb7180' + + # The following line is a no-op that aids the avocado + # fetchasset plugin that runs before any portion of the test + self.fetch_asset(kernel_url, asset_hash=kernel_hash) + self.do_test_mips_malta32el_nanomips(kernel_url, kernel_hash) def test_aarch64_xlnx_versal_virt(self):
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 redundant code, true, but one that doesn't hurt the test and aids 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 | 15 +++++++++++++++ 1 file changed, 15 insertions(+)