From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A00DC433E0 for ; Tue, 26 Jan 2021 09:47:07 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 96D542255F for ; Tue, 26 Jan 2021 09:47:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 96D542255F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4KwD-00068l-Aj for qemu-devel@archiver.kernel.org; Tue, 26 Jan 2021 04:47:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44942) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4Kv4-0005YI-HX for qemu-devel@nongnu.org; Tue, 26 Jan 2021 04:45:56 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:40771) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l4Kuy-0001lr-Pi for qemu-devel@nongnu.org; Tue, 26 Jan 2021 04:45:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611654347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Susqszl05XGsuuuPk0lbclFRoyEJ8CEMMUl5LoDsU+c=; b=X/bje2QNL63KAfe0J5IffYL/v97HjF7eg/hTaRpSDJjdP1eHqZzgynAtMLvZqXuqMusBn5 gbiqi/a9cQrpQ3Ul+PgXn7GZo6xl/u8/Elqydhxfoi2HOz0LXojDKuxwY25aUU+64bZ6om Hxy+rzohwVL3L8kf5ZByRTmQmcYH9g0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-497-6PxRXADmP1aAT6QeQrqQnQ-1; Tue, 26 Jan 2021 04:45:44 -0500 X-MC-Unique: 6PxRXADmP1aAT6QeQrqQnQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0BAD71966320; Tue, 26 Jan 2021 09:45:43 +0000 (UTC) Received: from merkur.fritz.box (ovpn-114-202.ams2.redhat.com [10.36.114.202]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 94D776F45C; Tue, 26 Jan 2021 09:45:41 +0000 (UTC) Date: Tue, 26 Jan 2021 10:45:39 +0100 From: Kevin Wolf To: Vladimir Sementsov-Ogievskiy Subject: Re: [PATCH v8 2/5] iotests: add testenv.py Message-ID: <20210126094539.GA4385@merkur.fritz.box> References: <20210123210428.27220-1-vsementsov@virtuozzo.com> <20210123210428.27220-3-vsementsov@virtuozzo.com> <20210125220528.GA170615@merkur.fritz.box> <86218b16-33cd-b9da-cb36-892c301197a3@virtuozzo.com> MIME-Version: 1.0 In-Reply-To: <86218b16-33cd-b9da-cb36-892c301197a3@virtuozzo.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=216.205.24.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.255, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: qemu-block@nongnu.org, jsnow@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Am 26.01.2021 um 09:28 hat Vladimir Sementsov-Ogievskiy geschrieben: > 26.01.2021 01:05, Kevin Wolf wrote: > > Am 23.01.2021 um 22:04 hat Vladimir Sementsov-Ogievskiy geschrieben: > > > Add TestEnv class, which will handle test environment in a new python > > > iotests running framework. > > > > > > Don't add compat=1.1 for qcow2 IMGOPTS, as v3 is default anyway. > > > > > > Signed-off-by: Vladimir Sementsov-Ogievskiy > > > --- > > > tests/qemu-iotests/testenv.py | 278 ++++++++++++++++++++++++++++++++++ > > > 1 file changed, 278 insertions(+) > > > create mode 100644 tests/qemu-iotests/testenv.py > > > > > > diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py > > > new file mode 100644 > > > index 0000000000..348af593e9 > > > --- /dev/null > > > +++ b/tests/qemu-iotests/testenv.py > > > @@ -0,0 +1,278 @@ > > > +# TestEnv class to manage test environment variables. > > > +# > > > +# Copyright (c) 2020-2021 Virtuozzo International GmbH > > > +# > > > +# This program is free software; you can redistribute it and/or modify > > > +# it under the terms of the GNU General Public License as published by > > > +# the Free Software Foundation; either version 2 of the License, or > > > +# (at your option) any later version. > > > +# > > > +# This program is distributed in the hope that it will be useful, > > > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > > > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > > +# GNU General Public License for more details. > > > +# > > > +# You should have received a copy of the GNU General Public License > > > +# along with this program. If not, see . > > > +# > > > + > > > +import os > > > +import sys > > > +import tempfile > > > +from pathlib import Path > > > +import shutil > > > +import collections > > > +import random > > > +import subprocess > > > +import glob > > > +from contextlib import AbstractContextManager > > > +from typing import Dict, Any, Optional > > > + > > > + > > > +def get_default_machine(qemu_prog: str) -> str: > > > + outp = subprocess.run([qemu_prog, '-machine', 'help'], check=True, > > > + universal_newlines=True, > > > + stdout=subprocess.PIPE).stdout > > > + > > > + machines = outp.split('\n') > > > + default_machine = next(m for m in machines if m.endswith(' (default)')) > > > + default_machine = default_machine.split(' ', 1)[0] > > > + > > > + alias_suf = ' (alias of {})'.format(default_machine) > > > + alias = next((m for m in machines if m.endswith(alias_suf)), None) > > > + if alias is not None: > > > + default_machine = alias.split(' ', 1)[0] > > > + > > > + return default_machine > > > + > > > + > > > +class TestEnv(AbstractContextManager['TestEnv']): > > > > I'm getting CI failures here: > > > > Traceback (most recent call last): > > File "./check", line 23, in > > from testenv import TestEnv > > File "/builds/.../qemu/tests/qemu-iotests/testenv.py", line 49, in > > class TestEnv(AbstractContextManager['TestEnv']): > > TypeError: 'ABCMeta' object is not subscriptable > > > > On the other hand, if I make it just AbstractContextManager without > > giving the type parameter, mypy complains: > > > > testenv.py:49: error: Missing type parameters for generic type "ContextManager" > > > > I guess I need to have another look into this tomorrow. > > It may help to use typing.ContextManager instead of > AbstractContextManager. mypy is OK with it, probably CI will be OK > too.. Okay, I'm trying now if this change works (on top of v9, of course). If it does, I'll just squash it in. I also silenced some of the mypy warnings, so that I'm not testing with the following patch squashed in. Kevin diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py index ca9cab531b..becea1bb7d 100644 --- a/tests/qemu-iotests/testenv.py +++ b/tests/qemu-iotests/testenv.py @@ -25,8 +25,7 @@ import collections import random import subprocess import glob -from contextlib import AbstractContextManager -from typing import Dict, Any, Optional +from typing import ContextManager, Dict, Any, Optional def isxfile(path: str) -> bool: @@ -50,7 +49,7 @@ def get_default_machine(qemu_prog: str) -> str: return default_machine -class TestEnv(AbstractContextManager['TestEnv']): +class TestEnv(ContextManager['TestEnv']): """ Manage system environment for running tests @@ -81,7 +80,7 @@ class TestEnv(AbstractContextManager['TestEnv']): return env - def init_directories(self): + def init_directories(self) -> None: """Init directory variables: PYTHONPATH TEST_DIR @@ -114,7 +113,7 @@ class TestEnv(AbstractContextManager['TestEnv']): self.output_dir = os.getcwd() # OUTPUT_DIR - def init_binaries(self): + def init_binaries(self) -> None: """Init binary path variables: PYTHON (for bash tests) QEMU_PROG, QEMU_IMG_PROG, QEMU_IO_PROG, QEMU_NBD_PROG, QSD_PROG @@ -122,7 +121,7 @@ class TestEnv(AbstractContextManager['TestEnv']): """ self.python = sys.executable - def root(*names): + def root(*names: str) -> str: return os.path.join(self.build_root, *names) arch = os.uname().machine