diff mbox series

tests/functional/test_rx_gdbsim: Use stable URL for test_linux_sash

Message ID 20241229083419.180423-1-huth@tuxfamily.org
State New
Headers show
Series tests/functional/test_rx_gdbsim: Use stable URL for test_linux_sash | expand

Commit Message

Thomas Huth Dec. 29, 2024, 8:34 a.m. UTC 
From: Philippe Mathieu-Daudé <f4bug@amsat.org>

Yoshinori said [*] URL references on OSDN were stable, but they
appear not to be. Mirror the artifacts on GitHub to avoid failures
while testing on CI.

[*] https://www.mail-archive.com/qemu-devel@nongnu.org/msg686487.html

Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Reported-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-ID: <20200630202631.7345-1-f4bug@amsat.org>
[huth: Adapt the patch to the new version in the functional framework]
Signed-off-by: Thomas Huth <huth@tuxfamily.org>
---
 tests/functional/test_rx_gdbsim.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

Comments

Alex Bennée Dec. 29, 2024, 4:31 p.m. UTC | #1 
Thomas Huth <huth@tuxfamily.org> writes:

> From: Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> Yoshinori said [*] URL references on OSDN were stable, but they
> appear not to be. Mirror the artifacts on GitHub to avoid failures
> while testing on CI.
>
> [*] https://www.mail-archive.com/qemu-devel@nongnu.org/msg686487.html
>
> Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
> Reported-by: Alex Bennée <alex.bennee@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Message-ID: <20200630202631.7345-1-f4bug@amsat.org>
> [huth: Adapt the patch to the new version in the functional framework]
> Signed-off-by: Thomas Huth <huth@tuxfamily.org>

The test works but I'm definitely missing some of the console output
from the end:

  ➜  head ./tests/functional/rx/test_rx_gdbsim.RxGdbSimMachine.test_uboot/base.log
  2024-12-29 16:30:13,829 - DEBUG: Using cached asset /home/alex/.cache/qemu/download/dd7dd4220cccf7aeb32227b26233bf39600db05c3f8e26005bcc2bf6c927207d for https://github.com/philmd/qemu-testing-blob/raw/rx-gdbsim/rx/gdbsim/u-boot.bin
  2024-12-29 16:30:13,829 - DEBUG: QEMUMachine "default" created
  2024-12-29 16:30:13,829 - DEBUG: QEMUMachine "default" temp_dir: /home/alex/lsrc/qemu.git/builds/all/tests/functional/rx/test_rx_gdbsim.RxGdbSimMachine.test_uboot/scratch/qemu-machine-pb_7irt4
  2024-12-29 16:30:13,829 - DEBUG: VM launch command: '/home/alex/lsrc/qemu.git/builds/all/qemu-system-rx -display none -vga none -chardev socket,id=mon,fd=5 -mon chardev=mon,mode=control -machine gdbsim-r5f562n8 -chardev socket,id=console,fd=10 -serial chardev:console -bios /home/alex/.cache/qemu/download/dd7dd4220cccf7aeb32227b26233bf39600db05c3f8e26005bcc2bf6c927207d -no-reboot'
  2024-12-29 16:30:13,857 - DEBUG: Console interaction: success_msg='U-Boot 2016.05-rc3-23705-ga1ef3c71cb-dirty' failure_msg='None' send_string='None'
  2024-12-29 16:30:13,857 - DEBUG: Opening console socket
  2024-12-29 16:30:13,863 - DEBUG: Shutting down VM appliance; timeout=30
  2024-12-29 16:30:13,863 - DEBUG: Attempting graceful termination
  2024-12-29 16:30:13,863 - DEBUG: Closing console socket
  2024-12-29 16:30:13,863 - DEBUG: Politely asking QEMU to terminate
  🕙16:31:20 alex@draig:qemu.git/builds/all  on  testing/next [$?] 
  ➜  cat ./tests/functional/rx/test_rx_gdbsim.RxGdbSimMachine.test_uboot/console.log 
  2024-12-29 16:30:13,859: 
  2024-12-29 16:30:13,859: 
  2024-12-29 16:30:13,863: U-Boot 2016.05-rc3-23705-ga1ef3c71cb-dirty
  🕙16:31:32 alex@draig:qemu.git/builds/all  on  testing/next [$?] 

> ---
>  tests/functional/test_rx_gdbsim.py | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/tests/functional/test_rx_gdbsim.py b/tests/functional/test_rx_gdbsim.py
> index 20623aa51c..49245793e1 100755
> --- a/tests/functional/test_rx_gdbsim.py
> +++ b/tests/functional/test_rx_gdbsim.py
> @@ -21,13 +21,16 @@ class RxGdbSimMachine(QemuSystemTest):
>      KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
>  
>      ASSET_UBOOT = Asset(
> -        'https://acc.dl.osdn.jp/users/23/23888/u-boot.bin.gz',
> -        '7146567d669e91dbac166384b29aeba1715beb844c8551e904b86831bfd9d046')
> +        ('https://github.com/philmd/qemu-testing-blob/raw/rx-gdbsim/rx/gdbsim/'
> +         'u-boot.bin'),
> +        'dd7dd4220cccf7aeb32227b26233bf39600db05c3f8e26005bcc2bf6c927207d')
>      ASSET_DTB = Asset(
> -        'https://acc.dl.osdn.jp/users/23/23887/rx-virt.dtb',
> +        ('https://github.com/philmd/qemu-testing-blob/raw/rx-gdbsim/rx/gdbsim/'
> +         'rx-gdbsim.dtb'),
>          'aa278d9c1907a4501741d7ee57e7f65c02dd1b3e0323b33c6d4247f1b32cf29a')
>      ASSET_KERNEL = Asset(
> -        'http://acc.dl.osdn.jp/users/23/23845/zImage',
> +        ('https://github.com/philmd/qemu-testing-blob/raw/rx-gdbsim/rx/gdbsim/'
> +         'zImage'),
>          'baa43205e74a7220ed8482188c5e9ce497226712abb7f4e7e4f825ce19ff9656')
>  
>      def test_uboot(self):
> @@ -36,7 +39,7 @@ def test_uboot(self):
>          """
>          self.set_machine('gdbsim-r5f562n8')
>  
> -        uboot_path = self.uncompress(self.ASSET_UBOOT)
> +        uboot_path = self.ASSET_UBOOT.fetch()
>  
>          self.vm.set_console()
>          self.vm.add_args('-bios', uboot_path,
Philippe Mathieu-Daudé Dec. 29, 2024, 5:20 p.m. UTC | #2 
On 29/12/24 17:31, Alex Bennée wrote:
> Thomas Huth <huth@tuxfamily.org> writes:
> 
>> From: Philippe Mathieu-Daudé <f4bug@amsat.org>
>>
>> Yoshinori said [*] URL references on OSDN were stable, but they
>> appear not to be. Mirror the artifacts on GitHub to avoid failures
>> while testing on CI.
>>
>> [*] https://www.mail-archive.com/qemu-devel@nongnu.org/msg686487.html
>>
>> Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
>> Reported-by: Alex Bennée <alex.bennee@linaro.org>
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> Message-ID: <20200630202631.7345-1-f4bug@amsat.org>
>> [huth: Adapt the patch to the new version in the functional framework]
>> Signed-off-by: Thomas Huth <huth@tuxfamily.org>
> 
> The test works but I'm definitely missing some of the console output
> from the end:

Is it https://gitlab.com/qemu-project/qemu/-/issues/2691
(also https://gitlab.com/qemu-project/qemu/-/issues/507)?

>    ➜  head ./tests/functional/rx/test_rx_gdbsim.RxGdbSimMachine.test_uboot/base.log
>    2024-12-29 16:30:13,829 - DEBUG: Using cached asset /home/alex/.cache/qemu/download/dd7dd4220cccf7aeb32227b26233bf39600db05c3f8e26005bcc2bf6c927207d for https://github.com/philmd/qemu-testing-blob/raw/rx-gdbsim/rx/gdbsim/u-boot.bin
>    2024-12-29 16:30:13,829 - DEBUG: QEMUMachine "default" created
>    2024-12-29 16:30:13,829 - DEBUG: QEMUMachine "default" temp_dir: /home/alex/lsrc/qemu.git/builds/all/tests/functional/rx/test_rx_gdbsim.RxGdbSimMachine.test_uboot/scratch/qemu-machine-pb_7irt4
>    2024-12-29 16:30:13,829 - DEBUG: VM launch command: '/home/alex/lsrc/qemu.git/builds/all/qemu-system-rx -display none -vga none -chardev socket,id=mon,fd=5 -mon chardev=mon,mode=control -machine gdbsim-r5f562n8 -chardev socket,id=console,fd=10 -serial chardev:console -bios /home/alex/.cache/qemu/download/dd7dd4220cccf7aeb32227b26233bf39600db05c3f8e26005bcc2bf6c927207d -no-reboot'
>    2024-12-29 16:30:13,857 - DEBUG: Console interaction: success_msg='U-Boot 2016.05-rc3-23705-ga1ef3c71cb-dirty' failure_msg='None' send_string='None'
>    2024-12-29 16:30:13,857 - DEBUG: Opening console socket
>    2024-12-29 16:30:13,863 - DEBUG: Shutting down VM appliance; timeout=30
>    2024-12-29 16:30:13,863 - DEBUG: Attempting graceful termination
>    2024-12-29 16:30:13,863 - DEBUG: Closing console socket
>    2024-12-29 16:30:13,863 - DEBUG: Politely asking QEMU to terminate
>    🕙16:31:20 alex@draig:qemu.git/builds/all  on  testing/next [$?]
>    ➜  cat ./tests/functional/rx/test_rx_gdbsim.RxGdbSimMachine.test_uboot/console.log
>    2024-12-29 16:30:13,859:
>    2024-12-29 16:30:13,859:
>    2024-12-29 16:30:13,863: U-Boot 2016.05-rc3-23705-ga1ef3c71cb-dirty
>    🕙16:31:32 alex@draig:qemu.git/builds/all  on  testing/next [$?]
> 
>> ---
>>   tests/functional/test_rx_gdbsim.py | 13 ++++++++-----
>>   1 file changed, 8 insertions(+), 5 deletions(-)
Yoshinori Sato Dec. 31, 2024, 12:16 p.m. UTC | #3 
On Sun, 29 Dec 2024 17:34:19 +0900,
Thomas Huth wrote:
> 
> From: Philippe Mathieu-Daudé <f4bug@amsat.org>
> 
> Yoshinori said [*] URL references on OSDN were stable, but they
> appear not to be. Mirror the artifacts on GitHub to avoid failures
> while testing on CI.

Thanks.
OSDN's service seems to have been unstable for a while now.
I can't provide a replacement right away. Please use a mirror.

> [*] https://www.mail-archive.com/qemu-devel@nongnu.org/msg686487.html
> 
> Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
> Reported-by: Alex Bennée <alex.bennee@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Message-ID: <20200630202631.7345-1-f4bug@amsat.org>
> [huth: Adapt the patch to the new version in the functional framework]
> Signed-off-by: Thomas Huth <huth@tuxfamily.org>
> ---
>  tests/functional/test_rx_gdbsim.py | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/tests/functional/test_rx_gdbsim.py b/tests/functional/test_rx_gdbsim.py
> index 20623aa51c..49245793e1 100755
> --- a/tests/functional/test_rx_gdbsim.py
> +++ b/tests/functional/test_rx_gdbsim.py
> @@ -21,13 +21,16 @@ class RxGdbSimMachine(QemuSystemTest):
>      KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
>  
>      ASSET_UBOOT = Asset(
> -        'https://acc.dl.osdn.jp/users/23/23888/u-boot.bin.gz',
> -        '7146567d669e91dbac166384b29aeba1715beb844c8551e904b86831bfd9d046')
> +        ('https://github.com/philmd/qemu-testing-blob/raw/rx-gdbsim/rx/gdbsim/'
> +         'u-boot.bin'),
> +        'dd7dd4220cccf7aeb32227b26233bf39600db05c3f8e26005bcc2bf6c927207d')
>      ASSET_DTB = Asset(
> -        'https://acc.dl.osdn.jp/users/23/23887/rx-virt.dtb',
> +        ('https://github.com/philmd/qemu-testing-blob/raw/rx-gdbsim/rx/gdbsim/'
> +         'rx-gdbsim.dtb'),
>          'aa278d9c1907a4501741d7ee57e7f65c02dd1b3e0323b33c6d4247f1b32cf29a')
>      ASSET_KERNEL = Asset(
> -        'http://acc.dl.osdn.jp/users/23/23845/zImage',
> +        ('https://github.com/philmd/qemu-testing-blob/raw/rx-gdbsim/rx/gdbsim/'
> +         'zImage'),
>          'baa43205e74a7220ed8482188c5e9ce497226712abb7f4e7e4f825ce19ff9656')
>  
>      def test_uboot(self):
> @@ -36,7 +39,7 @@ def test_uboot(self):
>          """
>          self.set_machine('gdbsim-r5f562n8')
>  
> -        uboot_path = self.uncompress(self.ASSET_UBOOT)
> +        uboot_path = self.ASSET_UBOOT.fetch()
>  
>          self.vm.set_console()
>          self.vm.add_args('-bios', uboot_path,
> -- 
> 2.47.1
>
diff mbox series

Patch

diff --git a/tests/functional/test_rx_gdbsim.py b/tests/functional/test_rx_gdbsim.py
index 20623aa51c..49245793e1 100755
--- a/tests/functional/test_rx_gdbsim.py
+++ b/tests/functional/test_rx_gdbsim.py
@@ -21,13 +21,16 @@  class RxGdbSimMachine(QemuSystemTest):
     KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
 
     ASSET_UBOOT = Asset(
-        'https://acc.dl.osdn.jp/users/23/23888/u-boot.bin.gz',
-        '7146567d669e91dbac166384b29aeba1715beb844c8551e904b86831bfd9d046')
+        ('https://github.com/philmd/qemu-testing-blob/raw/rx-gdbsim/rx/gdbsim/'
+         'u-boot.bin'),
+        'dd7dd4220cccf7aeb32227b26233bf39600db05c3f8e26005bcc2bf6c927207d')
     ASSET_DTB = Asset(
-        'https://acc.dl.osdn.jp/users/23/23887/rx-virt.dtb',
+        ('https://github.com/philmd/qemu-testing-blob/raw/rx-gdbsim/rx/gdbsim/'
+         'rx-gdbsim.dtb'),
         'aa278d9c1907a4501741d7ee57e7f65c02dd1b3e0323b33c6d4247f1b32cf29a')
     ASSET_KERNEL = Asset(
-        'http://acc.dl.osdn.jp/users/23/23845/zImage',
+        ('https://github.com/philmd/qemu-testing-blob/raw/rx-gdbsim/rx/gdbsim/'
+         'zImage'),
         'baa43205e74a7220ed8482188c5e9ce497226712abb7f4e7e4f825ce19ff9656')
 
     def test_uboot(self):
@@ -36,7 +39,7 @@  def test_uboot(self):
         """
         self.set_machine('gdbsim-r5f562n8')
 
-        uboot_path = self.uncompress(self.ASSET_UBOOT)
+        uboot_path = self.ASSET_UBOOT.fetch()
 
         self.vm.set_console()
         self.vm.add_args('-bios', uboot_path,