[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/32] tests/functional: remove hacky sleep from the tests
From: |
Alex Bennée |
Subject: |
[PULL 18/32] tests/functional: remove hacky sleep from the tests |
Date: |
Fri, 10 Jan 2025 13:17:40 +0000 |
We have proper detection of prompts now so we don't need to guess with
sleep() sprinkled through the test. The extra step of calling halt is
just to flush the final bits of the log (although the last line is
still missed).
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20250108121054.1126164-19-alex.bennee@linaro.org>
diff --git a/tests/functional/test_aarch64_virt.py
b/tests/functional/test_aarch64_virt.py
index 08576b0694..2d9995a95d 100755
--- a/tests/functional/test_aarch64_virt.py
+++ b/tests/functional/test_aarch64_virt.py
@@ -10,12 +10,12 @@
#
# SPDX-License-Identifier: GPL-2.0-or-later
-import time
import logging
from subprocess import check_call, DEVNULL
from qemu_test import QemuSystemTest, Asset
-from qemu_test import exec_command, wait_for_console_pattern
+from qemu_test import exec_command_and_wait_for_pattern
+from qemu_test import wait_for_console_pattern
from qemu_test import get_qemu_img
@@ -107,18 +107,22 @@ def common_aarch64_virt(self, machine):
'virtio-blk-device,drive=scratch')
self.vm.launch()
- self.wait_for_console_pattern('Welcome to Buildroot')
- time.sleep(0.1)
- exec_command(self, 'root')
- time.sleep(0.1)
- exec_command(self, 'dd if=/dev/hwrng of=/dev/vda bs=512 count=4')
- time.sleep(0.1)
- exec_command(self, 'md5sum /dev/vda')
- time.sleep(0.1)
- exec_command(self, 'cat /proc/interrupts')
- time.sleep(0.1)
- exec_command(self, 'cat /proc/self/maps')
- time.sleep(0.1)
+
+ ps1='#'
+ self.wait_for_console_pattern('login:')
+
+ commands = [
+ ('root', ps1),
+ ('cat /proc/interrupts', ps1),
+ ('cat /proc/self/maps', ps1),
+ ('uname -a', ps1),
+ ('dd if=/dev/hwrng of=/dev/vda bs=512 count=4', ps1),
+ ('md5sum /dev/vda', ps1),
+ ('halt -n', 'reboot: System halted')
+ ]
+
+ for cmd, pattern in commands:
+ exec_command_and_wait_for_pattern(self, cmd, pattern)
def test_aarch64_virt_gicv3(self):
self.common_aarch64_virt("virt,gic_version=3")
--
2.39.5
- [PULL 03/32] tests/functional: add a m68k tuxrun tests, (continued)
- [PULL 03/32] tests/functional: add a m68k tuxrun tests, Alex Bennée, 2025/01/10
- [PULL 05/32] tests/functional: update the mips32el tuxrun tests, Alex Bennée, 2025/01/10
- [PULL 13/32] tests/functional: update the sparc64 tuxrun tests, Alex Bennée, 2025/01/10
- [PULL 08/32] tests/functional: update the ppc32 tuxrun tests, Alex Bennée, 2025/01/10
- [PULL 10/32] tests/functional: update the riscv32 tuxrun tests, Alex Bennée, 2025/01/10
- [PULL 12/32] tests/functional: update the s390x tuxrun tests, Alex Bennée, 2025/01/10
- [PULL 09/32] tests/functional: update the ppc64 tuxrun tests, Alex Bennée, 2025/01/10
- [PULL 24/32] tests/lcitool: bump to latest version of libvirt-ci, Alex Bennée, 2025/01/10
- [PULL 14/32] tests/functional: update the x86_64 tuxrun tests, Alex Bennée, 2025/01/10
- [PULL 15/32] tests/functional/aarch64: add tests for FEAT_RME, Alex Bennée, 2025/01/10
- [PULL 18/32] tests/functional: remove hacky sleep from the tests,
Alex Bennée <=
- [PULL 31/32] dockerfiles: Remove 'MAINTAINER' entry in debian-tricore-cross.docker, Alex Bennée, 2025/01/10
- [PULL 11/32] tests/functional: update the riscv64 tuxrun tests, Alex Bennée, 2025/01/10
- [PULL 27/32] tests/vm: fix build_path based path, Alex Bennée, 2025/01/10
- [PULL 25/32] tests/docker: move riscv64 cross container from sid to trixie, Alex Bennée, 2025/01/10
- [PULL 23/32] tests/functional: extend test_aarch64_virt with vulkan test, Alex Bennée, 2025/01/10
- [PULL 32/32] MAINTAINERS: Remove myself from reviewers, Alex Bennée, 2025/01/10
- [PULL 16/32] tests/qtest: remove clock_steps from virtio tests, Alex Bennée, 2025/01/10
- [PULL 20/32] tests/functional: update tuxruntest to use uncompress utility, Alex Bennée, 2025/01/10
- [PULL 19/32] tests/functional: add zstd support to uncompress utility, Alex Bennée, 2025/01/10
- [PULL 17/32] system/qtest: properly feedback results of clock_[step|set], Alex Bennée, 2025/01/10