From f26eb0d9b8c8ae060f6a647bcbb38ac3648b6b79 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Thu, 16 May 2019 23:35:11 +0200 Subject: [PATCH] Qemu test: use pmbootstrap --details-to-stdout (!1785) The qemu test executes a pmbootstrap instance with pmb.helpers.run.user(). Use the --details-to-stdout flag from now on for the started pmbootstrap process, so it is not silent when downloading packages with apk, and will therefore not run into the timeout of the parent process (which kills processes that are silent for more than five minutes by default). This fixes the test in our CI infrastructure. --- test/test_qemu_running_processes.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test/test_qemu_running_processes.py b/test/test_qemu_running_processes.py index e3f4ef42..d709fb1c 100644 --- a/test/test_qemu_running_processes.py +++ b/test/test_qemu_running_processes.py @@ -69,11 +69,14 @@ def pmbootstrap_run(args, config, parameters, output="log"): def pmbootstrap_yes(args, config, parameters): """ - Execute pmbootstrap.py with a test pmbootstrap.conf, and pipe "yes" - into it (so we can do a fully automated installation, using "y" as - password everywhere). + Execute pmbootstrap.py with a test pmbootstrap.conf, and pipe "yes" into it + (so we can do a fully automated installation, using "y" as password + everywhere). Use --details-to-stdout to avoid the pmbootstrap process from + looking like it is hanging, when downloading packages with apk (otherwise + it would write no output, and get killed by the timeout). """ - command = "yes | ./pmbootstrap.py -c " + shlex.quote(config) + command = ("yes | ./pmbootstrap.py --details-to-stdout -c " + + shlex.quote(config)) for parameter in parameters: command += " " + shlex.quote(parameter) return pmb.helpers.run.user(args, ["/bin/sh", "-c", command],