diff mbox series

[PATCH-for-5.0?,v2,2/2] Revert "Acceptance test: cancel test if m68k kernel packages goes missing"

Message ID 20191126223810.20180-3-philmd@redhat.com (mailing list archive)
State New, archived
Headers show
Series tests/acceptance: Fix the m68k/q800 Linux test | expand

Commit Message

Philippe Mathieu-Daudé Nov. 26, 2019, 10:38 p.m. UTC
Now than we use the stable snapshot archive, we can remove this check.

This reverts commit d2499aca4bac613d837e2720e7bbe3378bc91245.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 tests/acceptance/boot_linux_console.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Comments

Willian Rampazzo Nov. 27, 2019, 2:53 p.m. UTC | #1
On Tue, Nov 26, 2019 at 7:38 PM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
>
> Now than we use the stable snapshot archive, we can remove this check.
>
> This reverts commit d2499aca4bac613d837e2720e7bbe3378bc91245.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  tests/acceptance/boot_linux_console.py | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py
> index 752f776f68..ab4c8a5e5a 100644
> --- a/tests/acceptance/boot_linux_console.py
> +++ b/tests/acceptance/boot_linux_console.py
> @@ -483,10 +483,7 @@ class BootLinuxConsole(Test):
>                     '/20191021T083923Z/pool-m68k/main'
>                     '/l/linux/kernel-image-5.3.0-1-m68k-di_5.3.7-1_m68k.udeb')
>          deb_hash = '044954bb9be4160a3ce81f8bc1b5e856b75cccd1'
> -        try:
> -            deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
> -        except OSError as exp:
> -            self.cancel(exp)
> +        deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
>          kernel_path = self.extract_from_deb(deb_path,
>                                              '/boot/vmlinux-5.3.0-1-m68k')
>

Tested-by: Willian Rampazzo <wrampazz@redhat.com>

Although I prefer to be on the safe side and keep the verification,
the code works as expected.

---
Willian
Philippe Mathieu-Daudé Nov. 27, 2019, 3:06 p.m. UTC | #2
On 11/27/19 3:53 PM, Willian Rampazzo wrote:
> On Tue, Nov 26, 2019 at 7:38 PM Philippe Mathieu-Daudé
> <philmd@redhat.com> wrote:
>>
>> Now than we use the stable snapshot archive, we can remove this check.
>>
>> This reverts commit d2499aca4bac613d837e2720e7bbe3378bc91245.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> ---
>>   tests/acceptance/boot_linux_console.py | 5 +----
>>   1 file changed, 1 insertion(+), 4 deletions(-)
>>
>> diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py
>> index 752f776f68..ab4c8a5e5a 100644
>> --- a/tests/acceptance/boot_linux_console.py
>> +++ b/tests/acceptance/boot_linux_console.py
>> @@ -483,10 +483,7 @@ class BootLinuxConsole(Test):
>>                      '/20191021T083923Z/pool-m68k/main'
>>                      '/l/linux/kernel-image-5.3.0-1-m68k-di_5.3.7-1_m68k.udeb')
>>           deb_hash = '044954bb9be4160a3ce81f8bc1b5e856b75cccd1'
>> -        try:
>> -            deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
>> -        except OSError as exp:
>> -            self.cancel(exp)
>> +        deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
>>           kernel_path = self.extract_from_deb(deb_path,
>>                                               '/boot/vmlinux-5.3.0-1-m68k')
>>
> 
> Tested-by: Willian Rampazzo <wrampazz@redhat.com>

Thanks for testing!

> Although I prefer to be on the safe side and keep the verification,
> the code works as expected.

If we want to catch that kind of errors, we should do it consistently in 
all the tests.

I understand the recent 'avocado assets' command from release 73 
properly fixes our problem, isn't it Cleber?

See https://avocado-framework.readthedocs.io/en/73.0/releases/73_0.html:

   INSTRUMENTED tests using the avocado.core.test.Test.fetch_asset()
   can take advantage of plugins that will attempt to download (and
   cache) assets before the test execution. This should make the
   overall test execution more reliable, and give better test
   execution times as the download time will be excluded. Users can
   also manually execute the avocado assets command to manually
   fetch assets from tests.

I'm anxious about testing this new feature :)

Regards,

Phil.
diff mbox series

Patch

diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py
index 752f776f68..ab4c8a5e5a 100644
--- a/tests/acceptance/boot_linux_console.py
+++ b/tests/acceptance/boot_linux_console.py
@@ -483,10 +483,7 @@  class BootLinuxConsole(Test):
                    '/20191021T083923Z/pool-m68k/main'
                    '/l/linux/kernel-image-5.3.0-1-m68k-di_5.3.7-1_m68k.udeb')
         deb_hash = '044954bb9be4160a3ce81f8bc1b5e856b75cccd1'
-        try:
-            deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
-        except OSError as exp:
-            self.cancel(exp)
+        deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
         kernel_path = self.extract_from_deb(deb_path,
                                             '/boot/vmlinux-5.3.0-1-m68k')