From f9dbdc628f21e667aa73a4d88f76405c8137d56b Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Wed, 7 Jun 2023 11:03:03 +0200 Subject: [PATCH] test: Check that the network is not configured Signed-off-by: Benjamin Drung --- debian/tests/qemu-ata-only | 1 + debian/tests/qemu-busybox | 1 + debian/tests/qemu-klibc | 1 + debian/tests/qemu-panic-shell | 3 +++ debian/tests/qemu-separate-usr | 1 + debian/tests/qemu-virtio-only | 1 + debian/tests/test-common | 12 ++++++++++++ 7 files changed, 20 insertions(+) diff --git a/debian/tests/qemu-ata-only b/debian/tests/qemu-ata-only index 79a91e2..ef742a5 100755 --- a/debian/tests/qemu-ata-only +++ b/debian/tests/qemu-ata-only @@ -21,3 +21,4 @@ build_initramfs build_rootfs_ext2 run_qemu +check_no_network_configuration diff --git a/debian/tests/qemu-busybox b/debian/tests/qemu-busybox index a24889c..c29c41f 100755 --- a/debian/tests/qemu-busybox +++ b/debian/tests/qemu-busybox @@ -15,6 +15,7 @@ lsinitramfs "${INITRAMFS}" | grep -qw busybox build_rootfs_ext2 run_qemu +check_no_network_configuration # Check that fsck ran grep -q "^/dev/${ROOTDISK_LINUX_NAME}: clean," "${OUTPUT}" diff --git a/debian/tests/qemu-klibc b/debian/tests/qemu-klibc index 6aa5c76..2111dab 100755 --- a/debian/tests/qemu-klibc +++ b/debian/tests/qemu-klibc @@ -15,6 +15,7 @@ build_initramfs build_rootfs_ext2 run_qemu +check_no_network_configuration # Check that fsck ran grep -q "^/dev/${ROOTDISK_LINUX_NAME}: clean," "${OUTPUT}" diff --git a/debian/tests/qemu-panic-shell b/debian/tests/qemu-panic-shell index 93e9ad9..296010f 100755 --- a/debian/tests/qemu-panic-shell +++ b/debian/tests/qemu-panic-shell @@ -20,13 +20,16 @@ build_initramfs build_rootfs_ext2 run_qemu_nocheck +check_no_network_configuration grep -qF "ALERT! /dev/nonexistent does not exist. Dropping to a shell!" "${OUTPUT}" grep -qF "(initramfs) " "${OUTPUT}" run_qemu_nocheck "panic=-1" +check_no_network_configuration grep -qF "Rebooting automatically due to panic= boot argument" "${OUTPUT}" ! grep -qF "(initramfs) " "${OUTPUT}" run_qemu_nocheck "panic=0" +check_no_network_configuration grep -qF "Halting automatically due to panic= boot argument" "${OUTPUT}" ! grep -qF "(initramfs) " "${OUTPUT}" diff --git a/debian/tests/qemu-separate-usr b/debian/tests/qemu-separate-usr index d1bce83..9a252f6 100755 --- a/debian/tests/qemu-separate-usr +++ b/debian/tests/qemu-separate-usr @@ -30,6 +30,7 @@ build_rootfs_ext2 build_fs_ext2 "${USRDIR}" "${USRDISK}" run_qemu +check_no_network_configuration # Check that fsck ran on both devices grep -q "^/dev/${ROOTDISK_LINUX_NAME}: clean," "${OUTPUT}" diff --git a/debian/tests/qemu-virtio-only b/debian/tests/qemu-virtio-only index fa9bbf7..79670cd 100755 --- a/debian/tests/qemu-virtio-only +++ b/debian/tests/qemu-virtio-only @@ -20,3 +20,4 @@ build_initramfs build_rootfs_ext2 run_qemu +check_no_network_configuration diff --git a/debian/tests/test-common b/debian/tests/test-common index 732ebad..840fe81 100644 --- a/debian/tests/test-common +++ b/debian/tests/test-common @@ -162,3 +162,15 @@ run_qemu() { _run_qemu "panic=-1" grep -qF "${INIT_MESSAGE}" "${OUTPUT}" } + +check_no_output() { + local msg="$1" + if grep -qF "${msg}" "${OUTPUT}"; then + echo >&2 "E: Message '${msg}' found in log output '${OUTPUT}." + exit 1 + fi +} + +check_no_network_configuration() { + check_no_output "Waiting up to 180 secs for" +}