Straight forward conversion. Update the SHA1 hashes to
SHA256 hashes since SHA1 should not be used anymore nowadays.

Add extract_from_deb() method in qemu_test.utils package.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 tests/avocado/boot_linux_console.py         | 21 ------------------
 tests/functional/qemu_test/utils.py         | 20 +++++++++++++++++
 tests/functional/test_mips64el_fuloong2e.py | 24 ++++++++++++++++++++-
 3 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py
index 18c69d6acc..01fd126c53 100644
--- a/tests/avocado/boot_linux_console.py
+++ b/tests/avocado/boot_linux_console.py
@@ -170,27 +170,6 @@ def test_mips64el_malta(self):
         console_pattern = 'Kernel command line: %s' % kernel_command_line
         self.wait_for_console_pattern(console_pattern)
 
-    def test_mips64el_fuloong2e(self):
-        """
-        :avocado: tags=arch:mips64el
-        :avocado: tags=machine:fuloong2e
-        :avocado: tags=endian:little
-        """
-        deb_url = ('http://archive.debian.org/debian/pool/main/l/linux/'
-                   'linux-image-3.16.0-6-loongson-2e_3.16.56-1+deb8u1_mipsel.deb')
-        deb_hash = 'd04d446045deecf7b755ef576551de0c4184dd44'
-        deb_path = self.fetch_asset(deb_url, asset_hash=deb_hash)
-        kernel_path = self.extract_from_deb(deb_path,
-                                            '/boot/vmlinux-3.16.0-6-loongson-2e')
-
-        self.vm.set_console()
-        kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=ttyS0'
-        self.vm.add_args('-kernel', kernel_path,
-                         '-append', kernel_command_line)
-        self.vm.launch()
-        console_pattern = 'Kernel command line: %s' % kernel_command_line
-        self.wait_for_console_pattern(console_pattern)
-
     def test_mips_malta_cpio(self):
         """
         :avocado: tags=arch:mips
diff --git a/tests/functional/qemu_test/utils.py b/tests/functional/qemu_test/utils.py
index 99eae5fc45..481a6b8e7c 100644
--- a/tests/functional/qemu_test/utils.py
+++ b/tests/functional/qemu_test/utils.py
@@ -14,6 +14,8 @@
 import shutil
 import tarfile
 
+from . import run_cmd
+
 def archive_extract(archive, dest_dir, member=None):
     with tarfile.open(archive) as tf:
         if hasattr(tarfile, 'data_filter'):
@@ -24,6 +26,24 @@ def archive_extract(archive, dest_dir, member=None):
         else:
             tf.extractall(path=dest_dir)
 
+def extract_from_deb(deb_path, output_path, file_path):
+    """
+    Extracts a file from a deb package into the test workdir
+
+    :param deb_path: path to the deb archive
+    :param file_path: path within the deb archive of the file to be extracted
+    :returns: full path of the extracted file
+    """
+    cwd = os.getcwd()
+    os.chdir(output_path)
+    (stdout, stderr, ret) = run_cmd(['ar', 't', deb_path])
+    tarball_name = stdout.split()[2]
+    run_cmd(['ar', 'x', deb_path, tarball_name])
+    file_path = file_path if file_path.startswith('.') else '.' + file_path
+    archive_extract(tarball_name, output_path, file_path)
+    os.chdir(cwd)
+    return os.path.join(output_path, file_path)
+
 def gzip_uncompress(gz_path, output_path):
     if os.path.exists(output_path):
         return
diff --git a/tests/functional/test_mips64el_fuloong2e.py b/tests/functional/test_mips64el_fuloong2e.py
index 7688a32713..674bf63a05 100755
--- a/tests/functional/test_mips64el_fuloong2e.py
+++ b/tests/functional/test_mips64el_fuloong2e.py
@@ -12,14 +12,36 @@
 import os
 import subprocess
 
-from qemu_test import QemuSystemTest
+from qemu_test import QemuSystemTest, Asset
 from qemu_test import wait_for_console_pattern
+from qemu_test.utils import extract_from_deb
 from unittest import skipUnless
 
 class MipsFuloong2e(QemuSystemTest):
 
     timeout = 60
 
+    KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
+
+    ASSET_KERNEL = Asset(
+        ('http://archive.debian.org/debian/pool/main/l/linux/'
+         'linux-image-3.16.0-6-loongson-2e_3.16.56-1+deb8u1_mipsel.deb'),
+        '2a70f15b397f4ced632b0c15cb22660394190644146d804d60a4796eefbe1f50')
+
+    def test_linux_kernel_3_16(self):
+        deb_path = self.ASSET_KERNEL.fetch()
+        kernel_path = extract_from_deb(deb_path, self.workdir,
+                                       '/boot/vmlinux-3.16.0-6-loongson-2e')
+
+        self.set_machine('fuloong2e')
+        self.vm.set_console()
+        kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=ttyS0'
+        self.vm.add_args('-kernel', kernel_path,
+                         '-append', kernel_command_line)
+        self.vm.launch()
+        console_pattern = 'Kernel command line: %s' % kernel_command_line
+        wait_for_console_pattern(self, console_pattern)
+
     @skipUnless(os.getenv('QEMU_TEST_ALLOW_UNTRUSTED_CODE'), 'untrusted code')
     @skipUnless(os.getenv('RESCUE_YL_PATH'), 'RESCUE_YL_PATH not available')
     def test_linux_kernel_2_6_27_isa_serial(self):
-- 
2.45.2

On 24/08/2024 18.08, Philippe Mathieu-Daudé wrote:
> Straight forward conversion. Update the SHA1 hashes to
> SHA256 hashes since SHA1 should not be used anymore nowadays.
> 
> Add extract_from_deb() method in qemu_test.utils package.

Should we maybe rather copy the whole LinuxKernelTest class into a new file 
in the qemu_tests folder, so that all the related tests can simply inherit 
from that class? That way we would also get the KERNEL_COMMON_COMMAND_LINE 
handling for free in all the tests that we convert. What do you think?

  Thomas

On 26/8/24 11:10, Thomas Huth wrote:
> On 24/08/2024 18.08, Philippe Mathieu-Daudé wrote:
>> Straight forward conversion. Update the SHA1 hashes to
>> SHA256 hashes since SHA1 should not be used anymore nowadays.
>>
>> Add extract_from_deb() method in qemu_test.utils package.
> 
> Should we maybe rather copy the whole LinuxKernelTest class into a new 
> file in the qemu_tests folder, so that all the related tests can simply 
> inherit from that class? That way we would also get the 
> KERNEL_COMMON_COMMAND_LINE handling for free in all the tests that we 
> convert. What do you think?

Except that variable, I'm not sure what can be reused. Most tests
are trivial. Maybe I'll realize after converting a few more :)

We could however have a LinuxKernelConstants class with 
KERNEL_COMMON_COMMAND_LINE if you rather.

On 26/08/2024 22.59, Philippe Mathieu-Daudé wrote:
> On 26/8/24 11:10, Thomas Huth wrote:
>> On 24/08/2024 18.08, Philippe Mathieu-Daudé wrote:
>>> Straight forward conversion. Update the SHA1 hashes to
>>> SHA256 hashes since SHA1 should not be used anymore nowadays.
>>>
>>> Add extract_from_deb() method in qemu_test.utils package.
>>
>> Should we maybe rather copy the whole LinuxKernelTest class into a new 
>> file in the qemu_tests folder, so that all the related tests can simply 
>> inherit from that class? That way we would also get the 
>> KERNEL_COMMON_COMMAND_LINE handling for free in all the tests that we 
>> convert. What do you think?
> 
> Except that variable, I'm not sure what can be reused. Most tests
> are trivial. Maybe I'll realize after converting a few more :)

Apart from that variable and the extract_from_* functions, that class is 
also redefining wait_for_console_pattern():

     def wait_for_console_pattern(self, success_message, vm=None):
         wait_for_console_pattern(self, success_message,
                              failure_message='Kernel panic - not syncing',
                              vm=vm)

So that failure_message handling is now missing in your converted test. I 
think I'd feel better if we keep that, or do you think it is ok to drop it?

  Thomas

On 27/8/24 07:27, Thomas Huth wrote:
> On 26/08/2024 22.59, Philippe Mathieu-Daudé wrote:
>> On 26/8/24 11:10, Thomas Huth wrote:
>>> On 24/08/2024 18.08, Philippe Mathieu-Daudé wrote:
>>>> Straight forward conversion. Update the SHA1 hashes to
>>>> SHA256 hashes since SHA1 should not be used anymore nowadays.
>>>>
>>>> Add extract_from_deb() method in qemu_test.utils package.
>>>
>>> Should we maybe rather copy the whole LinuxKernelTest class into a 
>>> new file in the qemu_tests folder, so that all the related tests can 
>>> simply inherit from that class? That way we would also get the 
>>> KERNEL_COMMON_COMMAND_LINE handling for free in all the tests that we 
>>> convert. What do you think?
>>
>> Except that variable, I'm not sure what can be reused. Most tests
>> are trivial. Maybe I'll realize after converting a few more :)
> 
> Apart from that variable and the extract_from_* functions, that class is

I don't see extract_from_deb() and extract_from_rpm() being specific
to a LinuxKernelTest class, IMO they belong to .utils with other
helpers such archive_extract().

I haven't added extract_from_rpm() there since I'd need to convert
a test using it to be able to test it, but it is planned.

Similarly image_pow2ceil_expand(), pow2ceil() and file_truncate()
are generic, not restricted to Linux console tests.

> also redefining wait_for_console_pattern():
> 
>      def wait_for_console_pattern(self, success_message, vm=None):
>          wait_for_console_pattern(self, success_message,
>                               failure_message='Kernel panic - not syncing',
>                               vm=vm)
> 
> So that failure_message handling is now missing in your converted test. 
> I think I'd feel better if we keep that, or do you think it is ok to 
> drop it?

Doh, I missed that.

On 27/08/2024 11.16, Philippe Mathieu-Daudé wrote:
> On 27/8/24 07:27, Thomas Huth wrote:
>> On 26/08/2024 22.59, Philippe Mathieu-Daudé wrote:
>>> On 26/8/24 11:10, Thomas Huth wrote:
>>>> On 24/08/2024 18.08, Philippe Mathieu-Daudé wrote:
>>>>> Straight forward conversion. Update the SHA1 hashes to
>>>>> SHA256 hashes since SHA1 should not be used anymore nowadays.
>>>>>
>>>>> Add extract_from_deb() method in qemu_test.utils package.
>>>>
>>>> Should we maybe rather copy the whole LinuxKernelTest class into a new 
>>>> file in the qemu_tests folder, so that all the related tests can simply 
>>>> inherit from that class? That way we would also get the 
>>>> KERNEL_COMMON_COMMAND_LINE handling for free in all the tests that we 
>>>> convert. What do you think?
>>>
>>> Except that variable, I'm not sure what can be reused. Most tests
>>> are trivial. Maybe I'll realize after converting a few more :)
>>
>> Apart from that variable and the extract_from_* functions, that class is
> 
> I don't see extract_from_deb() and extract_from_rpm() being specific
> to a LinuxKernelTest class, IMO they belong to .utils with other
> helpers such archive_extract().

.deb and .rpm are quite specific to Linux distros, so IMHO it's fine to keep 
them in the LinuxKernelTest class.

> I haven't added extract_from_rpm() there since I'd need to convert
> a test using it to be able to test it, but it is planned.
> 
> Similarly image_pow2ceil_expand(), pow2ceil() and file_truncate()
> are generic, not restricted to Linux console tests.

Agreed, these seem to be very generic functions that should reside in utils 
instead.

  Thomas