From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6990633379674718208 X-Received: by 2002:adf:f110:: with SMTP id r16mr1687967wro.358.1627633676765; Fri, 30 Jul 2021 01:27:56 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:cc8a:: with SMTP id p10ls540193wma.1.canary-gmail; Fri, 30 Jul 2021 01:27:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzqfQtP3J3p3kWMy4tT97GUnaFQdAOdlvpLz7K3YCFOnCB/NHsFFUY3iDQDREdoICEiufq2 X-Received: by 2002:a7b:c202:: with SMTP id x2mr1690295wmi.57.1627633675715; Fri, 30 Jul 2021 01:27:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627633675; cv=none; d=google.com; s=arc-20160816; b=a27a0/OqnBpxx3Lm0wAhwSJbRUUT7Bb9LH7TjdJx+GJwaBrVGVTpj0YC20KWhwtX4b /NL7yTpOs77sLyri6SJcNIAnqiXmqmA2hNXOJYL6RjvLtxpGIXzhmqAxsMgs7nvaEkg0 ymQMk+CprXmJ6DL77TPY++UCH6qI35FdB33bbkhmV1etxFO3kgtoxrelJvVq0FcI/vz5 SAZU3Sk9awyJpuVh2hzccWMHvumZ/t5ji/zVCevDPDf/Bcp95ZWB36YPEZ6dyoF3K1wN 6D9SRGTV24zCtzqz2ww+KfxeknifdDll/JHnGwNrRb0pEAXihQGuPV7jtBgVUs5fw0HI uxXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=E9+kcmsgx/2xjVd+jTSVCmaJdQwAJgiFW9+CX5pLdnc=; b=lEstWaMEU4VEIZ6E9eXeK+i1DHE/J5gR5NFvGfylXmOAmXYdIpwo2FZVs/VQiFAoQL QplznjIgtcgkDaWTbZJ6pSa2h6se5+Io9nw2PqpT+jIwFEEIm5OZf+b9AiAxxMMkDioS eutCkdFGvQkjjdiYzX28z73po+DOzC9uOIJRDD0iyDM+7wmJrfvbyEs+Ia9MFC5rS6H2 uHgPRT524lvj9UEgvuFIc6FUVsUT0EOjj09MRcpwfDZ+dX+W9MDsNY9pjGYx+FV3b1uG Ye2ZPDggQ86l79X0aXMUlZ3HaPr1kL9xzOyP6HteuJwV7KNRZ1B5bhGZQkF97KdRxKlD XnBA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id x13si58866wmk.4.2021.07.30.01.27.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Jul 2021 01:27:55 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-88-30-214-37.mgts.dynamic.pppoe.byfly.by [37.214.30.88] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 16U8RkvP008721 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 30 Jul 2021 10:27:55 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v10 07/17] vm_boot_test: Improve QEMU images checking Date: Fri, 30 Jul 2021 11:27:29 +0300 Message-Id: <20210730082739.15042-8-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210730082739.15042-1-amikan@ilbers.de> References: <20210730082739.15042-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: HRlQGRmbNlvK Makes QEMU start test to analyze boot log in real-time. It helps test cases to finish as soon as booting succeeds and do not wasting time on waiting. Get rid of python-subprocess32 backport package. Signed-off-by: Anton Mikanovich --- testsuite/vm_boot_test/vm_boot_test.py | 53 ++++++++++++++++++++------ 1 file changed, 42 insertions(+), 11 deletions(-) diff --git a/testsuite/vm_boot_test/vm_boot_test.py b/testsuite/vm_boot_test/vm_boot_test.py index eee14b2..6e580d0 100644 --- a/testsuite/vm_boot_test/vm_boot_test.py +++ b/testsuite/vm_boot_test/vm_boot_test.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 import os -import subprocess32 +import select +import subprocess import sys import time import tempfile @@ -13,6 +14,9 @@ import start_vm from avocado import Test +class CanBeFinished(Exception): + pass + class VmBase(Test): def vm_start(self, arch='amd64', distro='buster'): @@ -34,18 +38,45 @@ class VmBase(Test): self.log.info('QEMU boot line: ' + str(cmdline)) - devnull = open(os.devnull, 'w') - - p1 = subprocess32.Popen(cmdline, stdout=devnull, stderr=devnull) - time.sleep(int(time_to_wait)) - p1.kill() - p1.wait() + login_prompt = b'isar login:' + service_prompt = b'Just an example' + + timeout = time.time() + int(time_to_wait) + + p1 = subprocess.Popen(cmdline, stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + try: + poller = select.poll() + poller.register(p1.stdout, select.POLLIN) + poller.register(p1.stderr, select.POLLIN) + while time.time() < timeout and p1.poll() is None: + events = poller.poll(1000 * (timeout - time.time())) + for fd, event in events: + if fd == p1.stdout.fileno(): + # Wait for the complete string if it is read in chunks + # like "i", "sar", " login:" + time.sleep(0.01) + data = os.read(fd, 1024) + if login_prompt in data: + raise CanBeFinished + if fd == p1.stderr.fileno(): + self.log.error(p1.stderr.readline()) + except CanBeFinished: + self.log.debug('Got login prompt') + finally: + if p1.poll() is None: + p1.kill() + p1.wait() if os.path.exists(output_file): - if 'isar login:' in open(output_file).read(): - return - - self.fail('Test failed') + with open(output_file, "rb") as f1: + data = f1.read() + if service_prompt in data and login_prompt in data: + return + else: + self.log.error(data) + + self.fail('Log ' + output_file) class VmBootTestFast(VmBase): -- 2.25.1