From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6969105759827132416 X-Received: by 2002:a5d:414e:: with SMTP id c14mr11561020wrq.381.1625052575280; Wed, 30 Jun 2021 04:29:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1c90:: with SMTP id k16ls120399wms.2.canary-gmail; Wed, 30 Jun 2021 04:29:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxDdy7Tt9GVR/6Iy7X8ISHeYPs7rOZM8vDH0pMYDIluLdheAvCFkhsL3SjxsnxuRekg72Fo X-Received: by 2002:a7b:c117:: with SMTP id w23mr4089909wmi.102.1625052574538; Wed, 30 Jun 2021 04:29:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625052574; cv=none; d=google.com; s=arc-20160816; b=0x8WDPym+C2K5h6K94d4f23J+FB3/g1y5PakV3VO9yFnUM59R2kKWWI3kcwwToyOS1 jpWEBmGCUAqNMv/Qv8em00ZEcvFOyvRcTevxi7dRK8pSECbh5o5Vm1CDKjcM7pSfiOUH eOTao/0ALcODaM85E+sG1Q27XBgzjBbXKtApHZeC3UsMVG/3PwBBYlAli/mSxvsvEMm+ 9Knc0D1yiaKzNFUpVU6BJMWDpGagDPRUOe5vwMYnprxbVCoMOylG0y4phrLJaemwl7ME aY/PYTZvziXFvEmWua1dmPtXx+FzIqtmQESRaMvT86AbieoxBSwzAINyNUsYrNEuB6yf S1DQ== 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=kZprkE3Tihll5ipOTzO6Z2Ry93G2NaguG4xntPBtxn8BfxTvrSCbR317pMcRb57F1v Cv5mbI+ReSn6WIo50HpVe4T6RZyh5Pp52B08mSPIq8l2rogz8jcKX/srorAIdfiTJ8rG cG1A4lZUDD6pw0UgaGh1jG4FxWEQEE08frSZzHBdy6lX2SCsOAPbja3alPUx3+gWON0R Xa5Rth/T3pEN7wADwlIOg27/XrVnVRC1O8RrsM/zzStmZDPdpJk1z1w9iTXNre1OYqSX vSqXVSb9dYn+MUHl/kl8PLJEqZC1ZUaJBnKx/Eszlb0SR+Q+EQvQOKfLxDqTFDptlj84 ukig== 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 j63si242810wmj.2.2021.06.30.04.29.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Jun 2021 04:29:34 -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-249-65-214-37.mgts.dynamic.pppoe.byfly.by [37.214.65.249] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 15UBTMJO007380 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 30 Jun 2021 13:29:33 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v9 07/17] vm_boot_test: Improve QEMU images checking Date: Wed, 30 Jun 2021 14:28:59 +0300 Message-Id: <20210630112909.87092-8-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210630112909.87092-1-amikan@ilbers.de> References: <20210630112909.87092-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: fpABqAs5cTK2 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