From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6953642757724307456 X-Received: by 2002:aa7:cb0a:: with SMTP id s10mr39473452edt.36.1619021133024; Wed, 21 Apr 2021 09:05:33 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:e299:: with SMTP id gg25ls1365866ejb.2.gmail; Wed, 21 Apr 2021 09:05:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyztM0bE+qAkcJW/UlUcJU3qoRdKzwlZIDU7kljTQQfTiuXb6ijuEz7m1dAUTk6pAICJt1 X-Received: by 2002:a17:906:d154:: with SMTP id br20mr33113287ejb.28.1619021132213; Wed, 21 Apr 2021 09:05:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619021132; cv=none; d=google.com; s=arc-20160816; b=G39IyBXd0+IuU1xKyxDVwcyN1hEOdCUpJlPlYWDKnciyP+X+4Ea/U1vFKh4iKgFxCW BZkD9TV3AnYDfZKPb4mVpOwNGQYeiiujKMH7dLSUWHSLbJooXVkCN8H2rS+vwXeHcpSG E/zotzyQtqi/c+mg/yCY3RByXAT4PMclKyh23Rkr3rLIdP/oD/hFhBr6pgedZpB+yp8E Z3kbi+jX2KvAw7ms6Z8fmXLWpgK4P6SuW2VR3zGQyzDxggebBZo+55+i4A0afW34IzN1 xpOJt59YIclRHoVhsNMBwzFnqialcvjGqGJSXyCgSwg9rh8EpTvYFxJHsTpdmABLLX5Y ud0A== 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=j/HGf2uuWD7TtpwQuQ918fauGXKJTYBEL5UtgQ99q0LMxXcbJKtlg5p49UY1+nIU4W NQRo0CvyHDySTTcDg32gfk9h5eP9Sn+2F6tzKsJIxsGyKECamLzkKnfXyQvGhoSvJ+OS 6GBhXW/hBYiv5DWNPQtjsCZwhkuQOBgeYA3hBQ4FTK1Ke9o+MNAFYhuNpd5FuP7Cvmox Gjwqi0T5uMfLFdWGu5Iy9HrQC0/vsOA5MMFc8UD/E/0O1vtQjUf+RJCFrSbH+Hz034fw kDjaQmByyXrRtPD1BSVTf52+f/SJBIhhA6IT8rHCbw+WmuVcoTxl5i4dO9TrAXsfHrmB sdCQ== 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 m18si175938edd.5.2021.04.21.09.05.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Apr 2021 09:05:32 -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-153-39-214-37.mgts.dynamic.pppoe.byfly.by [37.214.39.153] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 13LG5C76027472 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 21 Apr 2021 18:05:31 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v4 06/14] vm_boot_test: Improve QEMU images checking Date: Wed, 21 Apr 2021 19:04:57 +0300 Message-Id: <20210421160505.67194-7-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210421160505.67194-1-amikan@ilbers.de> References: <20210421160505.67194-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: Q0KGCiP+QFHu 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