Received: by 2002:a05:6602:2086:0:0:0:0 with SMTP id a6csp4372083ioa; Wed, 27 Apr 2022 02:14:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQzUCbCMbHsm31DEn6nv2YSSdp4JimDxJfSLd2HcMX1iYQdmLCk77/l2cJdiIK7e6su1eZ X-Received: by 2002:a17:90b:17ca:b0:1d9:a666:b02c with SMTP id me10-20020a17090b17ca00b001d9a666b02cmr9948063pjb.219.1651050893085; Wed, 27 Apr 2022 02:14:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651050893; cv=none; d=google.com; s=arc-20160816; b=H1WG/RFGM8AvwO7wiBFu43Un0NcH1oXiF7LYX1TFVFxy3hEIRqsBVFe2V4OD39RC1O wB5Dr7jWlKDBiRP9K6J7vD3dTPuprbJLQeCYw2ZOx05B7y0KsAeBZeXYYuqkuZjYipAu RPmqaqtr8dzCoLpKRzmeNIhbY0onXs9F+EQTMHjDgTeyak5kP3cvSOW4Vh33/oeBRpqW zskMT5XmMkqrgLmzaYV33gS0MtsAsbNvb4ZaJSY1m7RbmJO/AhTufMSc/ntiH84YOpph CfK5EYZYjpr0Ngn0VZuMNp30Z/vbMtj5XmGRxNpWS7EPZ29Bmt1/hPDwYjnLbUelD4cn TFpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=lbSxUEPsGYbNKEJy+sMdn47L3eoN3ThAPUCxaVdqXME=; b=UQVsijZDEGqsHqFXacwhewpJn/F4be4Dfby0jAl0ExREYGmRG63TV583wvJInyNUhG Gj1DiI67xOZ9+r4FpPnL1CIIlnWhTAuvTqfLqoBIw44aPH7B1BoV42mJTKxh8FfsZesj 3WHvTr/EWocIjk7doNzjynDdOChPg/om9L+/hZjY/rG/HSmFM5/kWj4PjOPIwD6FyUap /ZgJCSEoxDaw6UW1gW+rN/0OowwcO+2SkQS/V8syTLkSPy+qhKXzpgjOMzXLDxIBY6KB CnHLflGwj+KsH6wFdMRV94lwOVtL7GpwkYNJ0/IzLJ66rb9zEVHio/IDy9AVV/5CCVcu wcLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=qNwnISX0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id nv9-20020a17090b1b4900b001cb93c25a14si1471982pjb.58.2022.04.27.02.14.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 02:14:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=qNwnISX0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id EA3AB2194D9; Wed, 27 Apr 2022 02:04:57 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349071AbiDZRhB (ORCPT + 99 others); Tue, 26 Apr 2022 13:37:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348799AbiDZRg7 (ORCPT ); Tue, 26 Apr 2022 13:36:59 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D385D78931 for ; Tue, 26 Apr 2022 10:33:51 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-2d11b6259adso161711747b3.19 for ; Tue, 26 Apr 2022 10:33:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=lbSxUEPsGYbNKEJy+sMdn47L3eoN3ThAPUCxaVdqXME=; b=qNwnISX0Pemz8rFoen1fpsOmmxqZh40IOeeqGlx2z0S/aVWzCgeDdY/y62SCptGN6d qzEsxVdT1KVwUcX5YWiDMLS2Ii/c6kgIMIGvb+evtFxosOJsHZWXqLkm2XXdNSNgE9/2 TKwxXgnfCk4O1BSsZ6vagSgjw0C/yrIrx5gYF1yuF0zLkz/fnPYlvwhob8dyAG4A83ev oVOCb6bnJcd6Ad7qpub4U3wvgsd8gu1tNkI2LLLqOkpPT8pvtYMmvsk1IDgUHwBpElYY PgXQz3Do7fSwjt+It6wpVrN5VO5C92KPlcO6WcB4VTOHzH3F03SHTV4Z3W4KK4D1i1Wv 6/9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=lbSxUEPsGYbNKEJy+sMdn47L3eoN3ThAPUCxaVdqXME=; b=vq1cmXkOPMMSViCdQHMrPUgFplIPIhwcnTPm0J9Io4qQ4PngVLuQlxVIs0MExpMke3 FigUpR+UftWv2BgeJdHngqnqR5Yi0R4b6omDWETMdaASX3KwHEVQtT8q+mUSd9vNdWui RKiIdYq/a+O2t73CivzYjF/BirBL9ycPJ9qGqNF3jT18zjfnLLrFhp7+8eDGcdgbbkOJ RsAW/rxz/y4rdcxr6NUlNMC2kosIQ4vs1b7/5cefOk2rVSA+8lb4prP1rd1PwtR/+Une nP8grJMzWB2TJnKDyFeJsJRHEEakisKcHD6rwBX1HJhAqjkRbFwUCsrJu/9iSzNOHbQV BVXg== X-Gm-Message-State: AOAM532E5WUNvlcC1qwxqkIyUs6K3P+kNiIETdSafZIeTu5vPFu/dcV3 ekeX/u2Gi25Cw1rlYrGYuRRPRGDfpn2euQ== X-Received: from dlatypov.svl.corp.google.com ([2620:15c:2cd:202:b03d:8d64:4a06:2c5f]) (user=dlatypov job=sendgmr) by 2002:a25:2a4c:0:b0:648:6a80:9cff with SMTP id q73-20020a252a4c000000b006486a809cffmr10741861ybq.507.1650994431115; Tue, 26 Apr 2022 10:33:51 -0700 (PDT) Date: Tue, 26 Apr 2022 10:33:33 -0700 In-Reply-To: <20220426173334.3871399-1-dlatypov@google.com> Message-Id: <20220426173334.3871399-2-dlatypov@google.com> Mime-Version: 1.0 References: <20220426173334.3871399-1-dlatypov@google.com> X-Mailer: git-send-email 2.36.0.rc2.479.g8af0fa9b8e-goog Subject: [PATCH 2/3] kunit: tool: make parser stop overwriting status of suites w/ no_tests From: Daniel Latypov To: brendanhiggins@google.com, davidgow@google.com Cc: linux-kernel@vger.kernel.org, kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.org, skhan@linuxfoundation.org, Daniel Latypov Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.5 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,USER_IN_DEF_DKIM_WL autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Consider this invocation $ ./tools/testing/kunit/kunit.py parse < parent_test = parse_test_header(lines, test) where we have special handling when we see "# Subtest" and we ignore the explicit reported "not ok 1" status! Also, NO_TESTS at a suite-level only results in a non-zero status code where then there's only one suite atm. This change is the minimal one to make sure we don't overwrite it. Signed-off-by: Daniel Latypov --- tools/testing/kunit/kunit_parser.py | 7 +++++-- .../test_data/test_is_test_passed-no_tests_no_plan.log | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/testing/kunit/kunit_parser.py b/tools/testing/kunit/kunit_parser.py index 7a0faf527a98..45c2c5837281 100644 --- a/tools/testing/kunit/kunit_parser.py +++ b/tools/testing/kunit/kunit_parser.py @@ -775,8 +775,11 @@ def parse_test(lines: LineStream, expected_num: int, log: List[str]) -> Test: # Check for there being no tests if parent_test and len(subtests) == 0: - test.status = TestStatus.NO_TESTS - test.add_error('0 tests run!') + # Don't override a bad status if this test had one reported. + # Assumption: no subtests means CRASHED is from Test.__init__() + if test.status in (TestStatus.TEST_CRASHED, TestStatus.SUCCESS): + test.status = TestStatus.NO_TESTS + test.add_error('0 tests run!') # Add statuses to TestCounts attribute in Test object bubble_up_test_results(test) diff --git a/tools/testing/kunit/test_data/test_is_test_passed-no_tests_no_plan.log b/tools/testing/kunit/test_data/test_is_test_passed-no_tests_no_plan.log index dd873c981108..4f81876ee6f1 100644 --- a/tools/testing/kunit/test_data/test_is_test_passed-no_tests_no_plan.log +++ b/tools/testing/kunit/test_data/test_is_test_passed-no_tests_no_plan.log @@ -3,5 +3,5 @@ TAP version 14 # Subtest: suite 1..1 # Subtest: case - ok 1 - case # SKIP + ok 1 - case ok 1 - suite -- 2.36.0.rc2.479.g8af0fa9b8e-goog