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=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 79B72C433E0 for ; Thu, 14 Jan 2021 00:19:51 +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 F1FF12310A for ; Thu, 14 Jan 2021 00:19:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F1FF12310A 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]:46914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzqMg-0002vU-06 for qemu-devel@archiver.kernel.org; Wed, 13 Jan 2021 19:19:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzqLc-0002CO-UJ for qemu-devel@nongnu.org; Wed, 13 Jan 2021 19:18:45 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:28323) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kzqLX-0005Dr-4y for qemu-devel@nongnu.org; Wed, 13 Jan 2021 19:18:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610583517; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fzxgJGSalAsXRXZbDrDFQG79lP+xToGQV+0PRyU81XQ=; b=KAnEUPu9zORIHPIR5jMfEuzG9K/91H/dABK9JZd1cRuPBVcJ4uDdB0tY7bCgc2l3yEeQd4 2bGiayXLVoYIzFfXfnHYVTqW0l2vynMR6ZYh/rvDXDWcAtT30JQT5iCW5kKp0eCZcbDFI9 r2xKq0CQRiGiYa2i+HlUcx5t22/XXCc= 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-401-QE-hbR9wOTuEUb9PedcZJA-1; Wed, 13 Jan 2021 19:18:35 -0500 X-MC-Unique: QE-hbR9wOTuEUb9PedcZJA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3D288806661; Thu, 14 Jan 2021 00:18:34 +0000 (UTC) Received: from [10.10.120.151] (ovpn-120-151.rdu2.redhat.com [10.10.120.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 637E9100AE3A; Thu, 14 Jan 2021 00:18:33 +0000 (UTC) Subject: Re: [PATCH v6 10/11] iotests: rewrite check into python To: Eric Blake , Vladimir Sementsov-Ogievskiy , qemu-block@nongnu.org References: <20210109122631.167314-1-vsementsov@virtuozzo.com> <20210109122631.167314-11-vsementsov@virtuozzo.com> <50b239fc-8105-2491-09d6-687c5826de23@redhat.com> From: John Snow Message-ID: Date: Wed, 13 Jan 2021 19:18:32 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <50b239fc-8105-2491-09d6-687c5826de23@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jsnow@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, 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=unavailable 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: kwolf@redhat.com, den@openvz.org, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 1/13/21 6:20 PM, Eric Blake wrote: > On 1/9/21 6:26 AM, Vladimir Sementsov-Ogievskiy wrote: >> Just use classes introduced in previous three commits. Behavior >> difference is described in these three commits. >> >> Drop group file, as it becomes unused. >> >> Signed-off-by: Vladimir Sementsov-Ogievskiy >> --- >> tests/qemu-iotests/check | 994 ++------------------------------------- >> tests/qemu-iotests/group | 321 ------------- >> 2 files changed, 28 insertions(+), 1287 deletions(-) >> delete mode 100644 tests/qemu-iotests/group > > The bulk of the work was done in the earlier patches, and my python > review is weak; but I can confirm that with this patch applied, my usual > attempts at running ./check still appeared to work for me. That's not > the same as proving you did 1:1 feature translation (and in fact, your > commit message documented dropping some features like -v), but if 'make > check' and CI tools still run, I'm okay leaving it up to developers to > complain about any other feature that they used but which go missing (or > to implement it). > > Tested-by: Eric Blake > I will *try* to give this a look, but I am still buried under post-PTO mail; and I feel comfortable with Kevin's Python review otherwise, so don't hold your breath waiting to hear from me. >> >> diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check >> index 952762d5ed..48bb3128c3 100755 >> --- a/tests/qemu-iotests/check >> +++ b/tests/qemu-iotests/check >> @@ -1,7 +1,8 @@ >> -#!/usr/bin/env bash >> +#!/usr/bin/env python3 >> # >> -# Copyright (C) 2009 Red Hat, Inc. >> -# Copyright (c) 2000-2002,2006 Silicon Graphics, Inc. All Rights Reserved. >> +# Configure environment and run group of tests in it. >> +# >> +# Copyright (c) 2020 Virtuozzo International GmbH > > You may want to claim 2021 as well. > >> +import sys >> +import os >> +from findtests import find_tests, TestFinder >> +from testenv import TestEnv >> +from testrunner import TestRunner >> + >> +if __name__ == '__main__': >> + if len(sys.argv) == 2 and sys.argv[1] in ['-h', '--help']: >> + print('Usage: ./check [options] [testlist]') >> + print() >> + TestFinder.get_argparser().print_help() >> + print() >> + TestEnv.get_argparser().print_help() >> + print() >> + TestRunner.get_argparser().print_help() >> + exit() >> + >> + env = TestEnv(sys.argv[1:]) >> + tests, remaining_argv = find_tests(env.remaining_argv, >> + test_dir=env.source_iotests) >> + >> + with TestRunner(remaining_argv, env) as tr: >> + assert not tr.remaining_argv >> + tr.run_tests([os.path.join(env.source_iotests, t) for t in tests]) > > A lot shorter for the main engine ;) > >> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group >> deleted file mode 100644 >> index bc5bc324fe..0000000000 >> --- a/tests/qemu-iotests/group >> +++ /dev/null >> @@ -1,321 +0,0 @@ >> -# >> -# QA groups control file >> -# Defines test groups > > Happy to see this conflict magnet go! > This rules. --js