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 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 83755C2B9F4 for ; Fri, 25 Jun 2021 18:27:31 +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 4985661954 for ; Fri, 25 Jun 2021 18:27:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4985661954 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]:43086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwqY6-0008Tc-F2 for qemu-devel@archiver.kernel.org; Fri, 25 Jun 2021 14:27:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwqRj-0003yz-3m for qemu-devel@nongnu.org; Fri, 25 Jun 2021 14:20:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:55696) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwqRY-0005kF-2o for qemu-devel@nongnu.org; Fri, 25 Jun 2021 14:20:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624645241; 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=Z8uSIxi5rAOVWnauFYWfs9lVeBg1hNx6H6z3MJHiOug=; b=BSk8VQOIiCnWS6KsxAu9gdqDAfrRHSxe/IzG5Ax7sTg5ac7gh7K31EbVv72sNkhK4LL7vm W2e45vtp1s64Ay2kAU8BgjSIeIrBcxjRyBYfBqvyalao2TfZAXxWHUS0WngxXykBn6KbLu esV+kD+y5mf/GdXAW8ikfXvHDqoZQ2E= 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-509-J9MCMCOKOpq2FRw_PlSxcQ-1; Fri, 25 Jun 2021 14:20:38 -0400 X-MC-Unique: J9MCMCOKOpq2FRw_PlSxcQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 760FD100C618; Fri, 25 Jun 2021 18:20:37 +0000 (UTC) Received: from scv.redhat.com (ovpn-118-71.rdu2.redhat.com [10.10.118.71]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D9E45D9C6; Fri, 25 Jun 2021 18:20:36 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH 07/10] iotests/297: return error code from run_linters() Date: Fri, 25 Jun 2021 14:20:18 -0400 Message-Id: <20210625182021.803227-8-jsnow@redhat.com> In-Reply-To: <20210625182021.803227-1-jsnow@redhat.com> References: <20210625182021.803227-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.362, 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_H4=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: Kevin Wolf , Vladimir Sementsov-Ogievskiy , Eduardo Habkost , qemu-block@nongnu.org, Markus Armbruster , Max Reitz , Cleber Rosa , John Snow Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This turns run_linters() into a bit of a hybrid test; returning non-zero on failed execution while also printing diffable information. This is done for the benefit of the avocado simple test runner, which will soon be attempting to execute this test from a different environment. (Note: universal_newlines is added to the pylint invocation for type consistency with the mypy run -- it's not strictly necessary, but it avoids some typing errors caused by our re-use of the 'p' variable.) Signed-off-by: John Snow --- tests/qemu-iotests/297 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297 index 1e8334d1d4..7db1f9ed45 100755 --- a/tests/qemu-iotests/297 +++ b/tests/qemu-iotests/297 @@ -68,19 +68,22 @@ def run_linters( files: List[str], directory: str = '.', env: Optional[Mapping[str, str]] = None, -) -> None: +) -> int: + ret = 0 print('=== pylint ===') sys.stdout.flush() # Todo notes are fine, but fixme's or xxx's should probably just be # fixed (in tests, at least) - subprocess.run( + p = subprocess.run( ('python3', '-m', 'pylint', '--score=n', '--notes=FIXME,XXX', *files), cwd=directory, env=env, check=False, + universal_newlines=True, ) + ret += p.returncode print('=== mypy ===') sys.stdout.flush() @@ -113,9 +116,12 @@ def run_linters( universal_newlines=True ) + ret += p.returncode if p.returncode != 0: print(p.stdout) + return ret + def main() -> None: for linter in ('pylint-3', 'mypy'): -- 2.31.1