tests/acceptance: Extract do_test_arm_orangepi_armbian_uboot() method
As we want to reuse the same U-Boot test for multiple Armbian releases, extract the common part as do_test_arm_orangepi_armbian_uboot(). Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Tested-by: Bin Meng <bin.meng@windriver.com> Tested-by: Niek Linnenbank <nieklinnenbank@gmail.com> Message-Id: <20201023131808.3198005-4-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
parent
ca82244928
commit
108a76da76
|
@ -802,27 +802,7 @@ class BootLinuxConsole(LinuxKernelTest):
|
||||||
# Wait for VM to shut down gracefully
|
# Wait for VM to shut down gracefully
|
||||||
self.vm.wait()
|
self.vm.wait()
|
||||||
|
|
||||||
@skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'),
|
def do_test_arm_orangepi_uboot_armbian(self, image_path):
|
||||||
'Test artifacts fetched from unreliable dl.armbian.com')
|
|
||||||
@skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited')
|
|
||||||
@skipUnless(P7ZIP_AVAILABLE, '7z not installed')
|
|
||||||
def test_arm_orangepi_bionic(self):
|
|
||||||
"""
|
|
||||||
:avocado: tags=arch:arm
|
|
||||||
:avocado: tags=machine:orangepi-pc
|
|
||||||
:avocado: tags=device:sd
|
|
||||||
"""
|
|
||||||
|
|
||||||
# This test download a 196MB compressed image and expand it to 1GB
|
|
||||||
image_url = ('https://dl.armbian.com/orangepipc/archive/'
|
|
||||||
'Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.7z')
|
|
||||||
image_hash = '196a8ffb72b0123d92cea4a070894813d305c71e'
|
|
||||||
image_path_7z = self.fetch_asset(image_url, asset_hash=image_hash)
|
|
||||||
image_name = 'Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.img'
|
|
||||||
image_path = os.path.join(self.workdir, image_name)
|
|
||||||
process.run("7z e -o%s %s" % (self.workdir, image_path_7z))
|
|
||||||
image_pow2ceil_expand(image_path)
|
|
||||||
|
|
||||||
self.vm.set_console()
|
self.vm.set_console()
|
||||||
self.vm.add_args('-drive', 'file=' + image_path + ',if=sd,format=raw',
|
self.vm.add_args('-drive', 'file=' + image_path + ',if=sd,format=raw',
|
||||||
'-nic', 'user',
|
'-nic', 'user',
|
||||||
|
@ -848,6 +828,29 @@ class BootLinuxConsole(LinuxKernelTest):
|
||||||
'to <orangepipc>')
|
'to <orangepipc>')
|
||||||
self.wait_for_console_pattern('Starting Load Kernel Modules...')
|
self.wait_for_console_pattern('Starting Load Kernel Modules...')
|
||||||
|
|
||||||
|
@skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'),
|
||||||
|
'Test artifacts fetched from unreliable apt.armbian.com')
|
||||||
|
@skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited')
|
||||||
|
@skipUnless(P7ZIP_AVAILABLE, '7z not installed')
|
||||||
|
def test_arm_orangepi_bionic_19_11(self):
|
||||||
|
"""
|
||||||
|
:avocado: tags=arch:arm
|
||||||
|
:avocado: tags=machine:orangepi-pc
|
||||||
|
:avocado: tags=device:sd
|
||||||
|
"""
|
||||||
|
|
||||||
|
# This test download a 196MB compressed image and expand it to 1GB
|
||||||
|
image_url = ('https://dl.armbian.com/orangepipc/archive/'
|
||||||
|
'Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.7z')
|
||||||
|
image_hash = '196a8ffb72b0123d92cea4a070894813d305c71e'
|
||||||
|
image_path_7z = self.fetch_asset(image_url, asset_hash=image_hash)
|
||||||
|
image_name = 'Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.img'
|
||||||
|
image_path = os.path.join(self.workdir, image_name)
|
||||||
|
process.run("7z e -o%s %s" % (self.workdir, image_path_7z))
|
||||||
|
image_pow2ceil_expand(image_path)
|
||||||
|
|
||||||
|
self.do_test_arm_orangepi_uboot_armbian(image_path)
|
||||||
|
|
||||||
@skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited')
|
@skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited')
|
||||||
def test_arm_orangepi_uboot_netbsd9(self):
|
def test_arm_orangepi_uboot_netbsd9(self):
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in a new issue