From nobody Tue Feb 10 05:09:39 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620039908; cv=none; d=zohomail.com; s=zohoarc; b=nGvvU18osg9yR2VpmAKHERrz+3f9DzpO6joswAW0Oa2SHKzNvGyVTqWrudFS5yY5W09cqJqu8RWbT58Ixjyb7PguayiuIb3Du2T2pQXAph2FXTyakEzUTjMipRmZLg0sEAvYwt3yLcFtjxQHswB6Mg3gkqbd+ODUqFgsXD9lpH8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620039908; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3ICg7BIgvQas5k23bDctJ3vrOhEuRu5Sz5mmBFT/OUU=; b=mAUdnlp25ZId0Qj+Ee6JZtLQxtkI+bkx8Y6sscCSpxo8dgc3KmRi04s95LNpF18ovufvFDKhT9vxBjqFrP546+vLiqvkKheg8BxnCxXQbHshMKmo+Te8qMNJxomg/vClmncwTjXnKk4noAA4FwxYvCCV0HN7ykp2EDS1aicPfUk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620039908805186.98719855276534; Mon, 3 May 2021 04:05:08 -0700 (PDT) Received: from localhost ([::1]:42244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldWNv-0005To-MQ for importer@patchew.org; Mon, 03 May 2021 07:05:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldWKL-0001rs-2j for qemu-devel@nongnu.org; Mon, 03 May 2021 07:01:25 -0400 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]:40775) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldWKJ-0004s3-23 for qemu-devel@nongnu.org; Mon, 03 May 2021 07:01:24 -0400 Received: by mail-ed1-x529.google.com with SMTP id c22so5762900edn.7 for ; Mon, 03 May 2021 04:01:22 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id v16sm12041464edt.53.2021.05.03.04.01.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 04:01:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3ICg7BIgvQas5k23bDctJ3vrOhEuRu5Sz5mmBFT/OUU=; b=Qw4KdZ0FS5TrBj+X8gQFEoWiQnpD1E2pVopqiYjMKujQ8ParIRLZ/NV+mNFXDmDACT RukM0hWNscv1F0NqVaLHw+ygjUg1ACEqJWKCOXrw6ZsfKy7mZvHNDl6MCnGQKHNLZiTq 3uClU81oCzhj3siAyj1MyGrUFxjKueVGWZg6eyH9Dvk0N1yN2FO96XcuU0W9uO8s+cCL /OCR+0DX37LTJecxQhCHmxV99GAjryRhX4tf63cIjpAcqa03S/SHdkk+2h7FjOsiXw0X fH/3ZloU5ZkF4ZGychy7g7Gt8GYLW86/ExGIEAIeVMO36RZAwWFPHzm09xz5kFhqpMI7 ksIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=3ICg7BIgvQas5k23bDctJ3vrOhEuRu5Sz5mmBFT/OUU=; b=YlAXKvckjvyOM00L7VqPzQOSE41MCLPLZHPHr6AgFeHYxL3819N8/8YhAioAjNa4Ws tNFFQs9MtWFHtQVDhSasOF0pPwr14IHt1Tyw8tSjYlpJ4ZSUcJzhZGdMKrdkbtCwJQif jlOehEUkZ+jAATONiCoSEFTvAwzexGcWZcr9vbeLHfmMzxrYxo4Wa1BR2xoH+Qc2g5Zt OBGlMlZY+XalJRq1Y97xeabhhjsgCRmNBJh98irkIjmxPPkMwkxTpX1oCEwOUKNF0oEc V1QoVtw/EkIFGg5mR5GnPDRYkoE6VKFOJxRJZvt0aGjStanEDuwvAukdaI+B9OOsNOpE 6itg== X-Gm-Message-State: AOAM533ig/RM7dK8leEAcqW4+rBFGX+HE0I7xra35DcXyQVp5WRbpqIW FUlj+4famHa6ekQuUCqmONhyTKMYAlI= X-Google-Smtp-Source: ABdhPJx93RqqyY81XKE5D4OLRM7i7MoGn+shWiX800jv3N3QFETXtl473RmPkFDKHawEJF8qqe0xJg== X-Received: by 2002:a05:6402:51d4:: with SMTP id r20mr19173829edd.112.1620039676772; Mon, 03 May 2021 04:01:16 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH v4 3/5] qemu-iotests: move command line and environment handling from TestRunner to TestEnv Date: Mon, 3 May 2021 13:01:08 +0200 Message-Id: <20210503110110.476887-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210503110110.476887-1-pbonzini@redhat.com> References: <20210503110110.476887-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::529; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x529.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: eesposit@redhat.com, vsementsov@virtuozzo.com, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" In the next patch, "check" will learn how to execute a test script without going through TestRunner. To enable this, keep only the text output and subprocess handling in the TestRunner; move into TestEnv the logic to prepare for running a subprocess. Reviewed-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Paolo Bonzini Tested-by: Emanuele Giuseppe Esposito Message-Id: <20210323181928.311862-4-pbonzini@redhat.com> --- tests/qemu-iotests/testenv.py | 17 ++++++++++++++++- tests/qemu-iotests/testrunner.py | 14 +------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py index 6d27712617..fca3a609e0 100644 --- a/tests/qemu-iotests/testenv.py +++ b/tests/qemu-iotests/testenv.py @@ -25,7 +25,7 @@ import random import subprocess import glob -from typing import Dict, Any, Optional, ContextManager +from typing import List, Dict, Any, Optional, ContextManager =20 =20 def isxfile(path: str) -> bool: @@ -74,6 +74,21 @@ class TestEnv(ContextManager['TestEnv']): 'CACHEMODE_IS_DEFAULT', 'IMGFMT_GENERIC', 'IMGOPTSSYN= TAX', 'IMGKEYSECRET', 'QEMU_DEFAULT_MACHINE', 'MALLOC_PERTU= RB_'] =20 + def prepare_subprocess(self, args: List[str]) -> Dict[str, str]: + if self.debug: + args.append('-d') + + with open(args[0], encoding=3D"utf-8") as f: + try: + if f.readline().rstrip() =3D=3D '#!/usr/bin/env python3': + args.insert(0, self.python) + except UnicodeDecodeError: # binary test? for future. + pass + + os_env =3D os.environ.copy() + os_env.update(self.get_env()) + return os_env + def get_env(self) -> Dict[str, str]: env =3D {} for v in self.env_variables: diff --git a/tests/qemu-iotests/testrunner.py b/tests/qemu-iotests/testrunn= er.py index 1fc61fcaa3..519924dc81 100644 --- a/tests/qemu-iotests/testrunner.py +++ b/tests/qemu-iotests/testrunner.py @@ -129,7 +129,6 @@ class TestRunner(ContextManager['TestRunner']): def __init__(self, env: TestEnv, makecheck: bool =3D False, color: str =3D 'auto') -> None: self.env =3D env - self.test_run_env =3D self.env.get_env() self.makecheck =3D makecheck self.last_elapsed =3D LastElapsedTime('.last-elapsed-cache', env) =20 @@ -243,18 +242,7 @@ def do_run_test(self, test: str) -> TestResult: silent_unlink(p) =20 args =3D [str(f_test.resolve())] - if self.env.debug: - args.append('-d') - - with f_test.open(encoding=3D"utf-8") as f: - try: - if f.readline().rstrip() =3D=3D '#!/usr/bin/env python3': - args.insert(0, self.env.python) - except UnicodeDecodeError: # binary test? for future. - pass - - env =3D os.environ.copy() - env.update(self.test_run_env) + env =3D self.env.prepare_subprocess(args) =20 t0 =3D time.time() with f_bad.open('w', encoding=3D"utf-8") as f: --=20 2.31.1