From patchwork Wed Mar 17 04:52:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 368 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:378f:0:0:0:0:0 with SMTP id r137csp645790oor; Wed, 17 Mar 2021 07:53:11 -0700 (PDT) X-Received: by 2002:ac2:53a7:: with SMTP id j7mr2787612lfh.305.1615992791622; Wed, 17 Mar 2021 07:53:11 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1615992791; cv=pass; d=google.com; s=arc-20160816; b=AUPMBhRzyZwTY+nL3+9dSSn7AuZS9MiN6a+1jaGR9vUFvGQt3uXtcfykw0fFGsv7/h AIyFlrppoxL8h/Ud8CWeObmnS+m6wPJD/dPbWdEJ5SKvihYgxpjWuX3FqoDN6JngLAeU TAJoNKibXC0MgpQlcdSFr4Nfk7Z1uRjAwKwg8VxLG0iNbfDqWw/85IWAE3O8D4biROyS 7c2NOz2P+LBguATVZ2xvpabYevFtRcPuO7FKYdR8zSX0WUlttP1qLIEuVeTdmotPXTd+ V68RAdPffgD0dzwKd2sLsQQzpDIoNxyRuNBp9FXZIOVQZnbn8jqv9hCqrcABZeKspjdh 0I1Q== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=xv6h7ObfjghRXPgz4zgVH9gQB2wNTak8yLeSjnuHCJo=; b=WkTrXjQQJ81D3x/vXET1prjlkjIISbItjiZJ/aau+LGsJVmAq40Xpatkir1Tk4j/hm qzdJ2f5aWrDz76JYF28x2LzuM1KbpHY4RtpSeHVh2vkqi86IKPxNy90TJ71Orxok5q6b D7729HFNdJa7xXUvhhL4efBUqAvxRve0qDNJURo4Gl8x8I8d6HPwuCLjBzrWe5XVEpWV G4TGa8/IQ+mWZHbh/J/O0idt5XryOUdB8WOK+oMJe+v3z0e6q9TGb5QxtbWWC5t/uUGc Z6Us9VXCiIghyC8mQuN3lDRmq6wWXLbTRTJQN5Rk9ybvga+UPcaHAU43ogpJaGIuSTuJ oSOg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=OBVBTjV2; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbv5pzcbamgqeth6rdca@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBV5PZCBAMGQETH6RDCA@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id c8sor2292884lfc.190.2021.03.17.07.53.11 (Google Transport Security); Wed, 17 Mar 2021 07:53:11 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbchiponzwecrbv5pzcbamgqeth6rdca@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=OBVBTjV2; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbv5pzcbamgqeth6rdca@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBV5PZCBAMGQETH6RDCA@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1615992791; cv=pass; d=google.com; s=arc-20160816; b=gbGMshxg/TapucgqLpu/hmDL+K9LSNlqh8jgG6vDjnhUGdpA1S0KP1KI6zoodS9HOa l5l6B2NMrJHxwOLtIAghnB7oGhaCoYT8jjaXkKhn1JzefSX++Ri0lAT24NeaJqxJDLc+ Fj9PpiCuiL6ZoUF2oKrZLbnebpX4uyr9ZwoyWnfkMv4xlMLzSP1PZ/hV4agFYe4CUjt/ KvkUJlCSPkgPa2kA1SX4wgyatQhQXUr0SOhQMvXZsHgkJK2JzqlxEy8U6Iafvqu9961D kAgtSj8DVDJkqjsP+tfg30c0nRv69IiDdxRCPRxnwCVuiCkyMN6ZWmgbxJwYghzY+HtO Bphg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=xv6h7ObfjghRXPgz4zgVH9gQB2wNTak8yLeSjnuHCJo=; b=MvkWIuCb7bjFFyWo9I8SMBrdSv2NesroLkmloLfa5he4xxZEvp+UzbIhVu6+XPAyHQ QEStLJilVe7qkuw6egFOtsOuEH54+8ur0ZzUBqUBD2Z69EJ1/GvxJufS/f5hVbMjc0h0 k95TAxTQ7zLuOWG3EIw5XRhtmODl7GIzrwoXvmSSKN0/ExKcpN62/GjADcR3oaaKOGOB lreaYHQB9Lkx6s8li/6RrVTFDMUNbj/U6NOCxSGl0ZTw0Bwf+K683Ou6wiQS0yxS/y08 ReaOkjoJTnghkrnYtnKqcxBSyYGXcp0vSsfJnkpb2otDI/lpwWa+ps6qvC23DsOtXKgs gmPw== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=xv6h7ObfjghRXPgz4zgVH9gQB2wNTak8yLeSjnuHCJo=; b=OBVBTjV2RyTBc4ndk1hL6yNmtgjf+qvmFHF4lY/gHRI+d+joZsScWsT/1zxhzdYPKh hkhM7j8iKg5R5+Bx4WoXkB1bnVqoANrnb6ZmL7FpHRBatyon/jRbGrNh7omzzb8jkVOG zsMg9+plUoaUjt2QUyM+LCumHO3DXMhibMbl2JO7qbCd/k3aKjVxH655iHPzJzqXJqPk zmRqRenzMnPxU3xzdLzKX/jg896zxR8IK/H+hzFRpCYdtrLAimypCSb3XGjtTa2498Qx mtrjKScHr2OvBfoT7xWzl0c4X6eOebPbhlR6Z+xF2yEmHkzenHUewAzNSGKouWGq6VIY /Nww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=xv6h7ObfjghRXPgz4zgVH9gQB2wNTak8yLeSjnuHCJo=; b=ie0ror8pQIGEoZHyk7ZcuQCyzstV9XgetAanKbqC2gqEIiobIrjcKM9MFvilw9MELS Rot4IdSvzEo0qoKPC2kqauCybAd6KyDPs1o6Ld5bBOA/pT0LTmfns7VJJ8dQPSXqZ2dD w03t8aMcUGj+mKqBra7j+8OS0P6SyTTAF8zCza4vzuESeY+k7shW2ECKV3ZJ3FXDTtW5 JtYOwlT/89Z3UA9ji6yInQgH0DijRFIJw8LmvlqVmAl7Vdd72ncEwkS7/a1fZVCOWjrn 8Gk8fk9wpKjhoVuQu2wCp/UO6ss5n6ta7PCMnv2yxNT98VXCZbEgrfhjb3juNRd5umsK r0/A== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530Agg0KI6BLGWbX46LBOvyBXNIabMtq3HnK8mJ0NxAvCCSQ5JPD em3idnP1QCUUwC8I1hzxEHM= X-Google-Smtp-Source: ABdhPJy9CiYhlz58IenxE589NXzknun+WvBwbZq7s3c6HO1rcYzTw4B63STtkaMAqBt5auQNI26/+Q== X-Received: by 2002:a05:6512:11c3:: with SMTP id h3mr2536672lfr.366.1615992791268; Wed, 17 Mar 2021 07:53:11 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:3c10:: with SMTP id j16ls5002304lja.2.gmail; Wed, 17 Mar 2021 07:53:10 -0700 (PDT) X-Received: by 2002:a2e:535a:: with SMTP id t26mr2588209ljd.503.1615992790361; Wed, 17 Mar 2021 07:53:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615992790; cv=none; d=google.com; s=arc-20160816; b=wp18CEtnme7TzXcLxGMoErGUYVmXe+VywVYpZavTcCFeZOjiYlBAJm9JLf5Y8m+Zyf YQycoO7Wze7+4m+oKJ1WUhl1zSUbJcLk8HPNNiUWIg2J4PIAVkF6oV8134AsJq2NkzeJ vVKW5IfS25TkLh/LgyK2a2Exu1Cptf3lcfGmFZ2w841mi3KVMSug3igsYeK9siMpPs2j Cjt/2nef8P7XEFykm4Q3X+eQbKGjl8XTG4nAB2Y7BZtB9yDoxMFQoRKbAqD90A9BjnAJ Gv4+9cmvAxPDK+iVyLAUjZdVN1dz952v33TnqYZQF33w+2d+JvNYHRpcgBP8MfFj1SGV ChtQ== 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=LXRRmcqEnJdbRNYQLvtzOJfpgkerR/2bma68XPh5iPc=; b=cBsJs8S02F5vSFRix7SUrgp1ZqSjX0I3sJga/ZRnwB+SOxruvfoH0rJzW4GkGAUJMd I9q02mBY9VgARP5KUhl4UvpWFQq61k+qGzWXDgdYNwzHUbZqN0z3fQ4tLY9v77yIYzkp USWX1EHTMyr1/Fuq7xoQMtmT+/snAiOVGY1UfhD7Hc92qOs93xYErnIJ+H3E+GpjoGEe USnMUfbksvAw1KbPoRkDGwGHmTCnMLHRrBdUQx+jIMVBYzaW8QyrrysQkwkbBTq38fJS r6hrMtGm63I+jTgGAm+AEHYDBWpKUa3i8xvLMOIODgBz9VQMHlar9re4MmS3Oby37cjQ Lstw== 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 Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id a10si929428lfs.11.2021.03.17.07.53.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Mar 2021 07:53:10 -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; Received: from localhost.localdomain (mm-117-75-121-178.mgts.dynamic.pppoe.byfly.by [178.121.75.117] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 12HEqhaF032071 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Mar 2021 15:53:09 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3 06/11] vm_boot_test: Improve QEMU images checking Date: Wed, 17 Mar 2021 17:52:20 +0300 Message-Id: <20210317145225.88050-7-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210317145225.88050-1-amikan@ilbers.de> References: <20210317145225.88050-1-amikan@ilbers.de> MIME-Version: 1.0 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-Original-Sender: amikan@ilbers.de X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1694491257573168890?= X-GMAIL-MSGID: =?utf-8?q?1694491257573168890?= 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 | 59 ++++++++++++++++++++------ 1 file changed, 47 insertions(+), 12 deletions(-) diff --git a/testsuite/vm_boot_test/vm_boot_test.py b/testsuite/vm_boot_test/vm_boot_test.py index 73fee3e..4c1b6fe 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'): @@ -31,23 +35,54 @@ class VmBase(Test): cmdline = start_vm.format_qemu_cmdline(arch, build_dir, distro, None, None) cmdline.insert(1, '-nographic') + cmdline.append('-chardev') + cmdline.append('stdio,id=ch0,logfile=' + output_file) cmdline.append('-serial') - cmdline.append('file:' + output_file) + cmdline.append('chardev:ch0') + cmdline.append('-monitor') + cmdline.append('none') 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):