Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp864387pxb; Mon, 25 Oct 2021 20:59:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyE4R5LDRxmVcJEA5k8CD2zsCaqlfDr/slzbp670q4EzupR18UEokmaWqcaaTxVKBXNXp06 X-Received: by 2002:a17:906:5e55:: with SMTP id b21mr20181358eju.58.1635220752455; Mon, 25 Oct 2021 20:59:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635220752; cv=none; d=google.com; s=arc-20160816; b=agX6kry1b4ciQD/g5cuU2gZMb+Clz37zG+C1FjoYCR+9da9upErCOdWJcwMWTVM4OR elMvKJgwG1jU7uRi/xQXw/g+8CjBHe4jwUnVumE4zHV0yfmyUv2Hn+W7fXJYKGmiqWie 9kI+pi6RD/tNMSjKtUpIuAWgZheRocdFpx9Pz/a6v+C4Y3IWY91MyyBw+60Z7l234VI+ B38TKAE8JHLfjqoswD9aymVGDLbZwdix0bytQhLIKi9I/PhBUxHf5mJsfJ9n6QPiuPVF 7q7XRkFONp4eyUmUp7SYXAsf8wvL/MjgdJFX7lQvLFqsdInJuPwkn89aq7eaql3ZTy4l s4cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=znBx27FBpzWvOmEpf8hPCY51x2n53pRBWUgp7QGSYx0=; b=tZZx6b4YQbE5cHpgCvRUucroc/5aLPFeoLVYbmb/rlYNjJjpLm8rhwjpki2nKlGwOU yQj/MoN+zXTdNmDKbWgyAdg4Ek6ll6UQt9ZmNjYpcbOXyFk9K4xi5KYEZ/wZ/rBDiyA+ pjz7H/q9iEWt6DoYsuzTufA1/96ldj7WuUDEH1phJ+zHIxv7W9pFdlqpxAEIRj9HRRRV +4HEj+XHVCcm+ys/JJUBSWzAg+2+lgpq/PTCy2HRDccrf8Xxkp3yG1d5YJt2Qm8jOqhB RiROlnb6hYUTyzEyKj66bljehvCgubEnFth0MRhu3vILQx4gQi4uuUdGxT1rnqOgvMHr qBxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=kdpMquJm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a25si23314520ejc.304.2021.10.25.20.58.49; Mon, 25 Oct 2021 20:59:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=kdpMquJm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.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: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235031AbhJYVRI (ORCPT + 99 others); Mon, 25 Oct 2021 17:17:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232621AbhJYVRA (ORCPT ); Mon, 25 Oct 2021 17:17:00 -0400 Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56140C061767 for ; Mon, 25 Oct 2021 14:14:35 -0700 (PDT) Received: by mail-pj1-x102e.google.com with SMTP id nn3-20020a17090b38c300b001a03bb6c4ebso1042123pjb.1 for ; Mon, 25 Oct 2021 14:14:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=znBx27FBpzWvOmEpf8hPCY51x2n53pRBWUgp7QGSYx0=; b=kdpMquJmZf4V/g0Bww28TPq5DRV6ScleTMRp2gZ5kVK0eOSRG4iSu7RxVKTgxmL0LW zX39YqnKB3pdEgaT0IZQM/TUSqZBZ90UCEcEe+Xp5vlC5nG6XcE/LTxTZS4sLrrFFWxF uLUBSVGL8jc/qb0y7Pqo7wBAYhmkEms5WOScvyWSIe09ieeQ9Tw7D6OLzen22fQyHxhR HRItdYCgOERW1BZuaP3UTj7P2KyV0b/Q0Yw4CzRnDbEf0880HpgT/BRq8UKmO2DlalAm Eb9qiBRdpIG4MCQ+i/LMchEn6M+CR6xVTSPo2nlPb4lnAN7hpidnBagJyMkgIce8A3dM KV7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=znBx27FBpzWvOmEpf8hPCY51x2n53pRBWUgp7QGSYx0=; b=MquiglPrchgW58BsDAF79mGlFUzerQIutFPaD9LxKrXU4nciF6uTbee4/6XseR4X3U voXErIpz2S3bLlRutHRFCi65XcFatCXKufI9bkNjBKd2M11mGUUr/SFaFQNWd/H12m71 YLb5D9tEjM7bz/jGgErnJkoGhOuWBmAcipe4DCr2nqodLCTVoyqGUblFjXAYT/Ag+oL0 fk2kaJxlJf8qpvQMSupe6euHwuuWx4aBLigdtHrB5w4kwjBUYN+7sVVpNhQJArkTsLTX d8LV+wSycvmO8CMChaMFVYxO7h2Mod3PVP0U1QULlT7vc9CpiGFQ9a6gR6p7HezGwoCz WBDQ== X-Gm-Message-State: AOAM532/PEa3XpFdOtQ6O3lUV17rUOJSrpe2UYOpUL/YFlahpPF/KtZz 3++h1L1PfAk0N8r6+NCOXJFQAx/0rrJAoeIenZXmgQ== X-Received: by 2002:a17:90b:694:: with SMTP id m20mr19103784pjz.198.1635196474490; Mon, 25 Oct 2021 14:14:34 -0700 (PDT) MIME-Version: 1.0 References: <20211021062819.1313964-1-davidgow@google.com> In-Reply-To: From: Brendan Higgins Date: Mon, 25 Oct 2021 14:14:23 -0700 Message-ID: Subject: Re: [PATCH 1/2] kunit: tool: Do not error on tests without test plans To: David Gow Cc: Daniel Latypov , Rae Moar , Shuah Khan , KUnit Development , "open list:KERNEL SELFTEST FRAMEWORK" , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Oct 22, 2021 at 5:25 PM David Gow wrote: > > On Sat, Oct 23, 2021 at 6:42 AM Daniel Latypov wrote: > > > > On Thu, Oct 21, 2021 at 11:10 PM David Gow wrote: > > > > > > On Fri, Oct 22, 2021 at 9:29 AM Daniel Latypov wrote: > > > > > > > > On Wed, Oct 20, 2021 at 11:28 PM David Gow wrote: > > > > > > > > > > The (K)TAP spec encourages test output to begin with a 'test plan': a > > > > > count of the number of tests being run of the form: > > > > > 1..n > > > > > > > > > > However, some test suites might not know the number of subtests in > > > > > advance (for example, KUnit's parameterised tests use a generator > > > > > function). In this case, it's not possible to print the test plan in > > > > > advance. > > > > > > > > > > kunit_tool already parses test output which doesn't contain a plan, but > > > > > reports an error. Since we want to use nested subtests with KUnit > > > > > paramterised tests, remove this error. > > > > > > > > > > Signed-off-by: David Gow > > > > > --- > > > > > tools/testing/kunit/kunit_parser.py | 5 ++--- > > > > > tools/testing/kunit/kunit_tool_test.py | 5 ++++- > > > > > 2 files changed, 6 insertions(+), 4 deletions(-) > > > > > > > > > > diff --git a/tools/testing/kunit/kunit_parser.py b/tools/testing/kunit/kunit_parser.py > > > > > index 3355196d0515..50ded55c168c 100644 > > > > > --- a/tools/testing/kunit/kunit_parser.py > > > > > +++ b/tools/testing/kunit/kunit_parser.py > > > > > @@ -340,8 +340,8 @@ def parse_test_plan(lines: LineStream, test: Test) -> bool: > > > > > """ > > > > > Parses test plan line and stores the expected number of subtests in > > > > > test object. Reports an error if expected count is 0. > > > > > - Returns False and reports missing test plan error if fails to parse > > > > > - test plan. > > > > > + Returns False and sets expected_count to None if there is no valid test > > > > > + plan. > > > > > > > > > > Accepted format: > > > > > - '1..[number of subtests]' > > > > > @@ -356,7 +356,6 @@ def parse_test_plan(lines: LineStream, test: Test) -> bool: > > > > > match = TEST_PLAN.match(lines.peek()) > > > > > if not match: > > > > > test.expected_count = None > > > > > - test.add_error('missing plan line!') > > > > > > > > This works well, but there's an edge case. > > > > > > > > This patch means we no longer print an error when there are no test > > > > cases in a subtest. > > > > We relied on a check just a bit lower in this function. > > > > > > > > Consider > > > > > > > > $ ./tools/testing/kunit/kunit.py parse < > > > TAP version 14 > > > > 1..1 > > > > # Subtest: suite > > > > 1..1 > > > > # Subtest: case > > > > ok 1 - case > > > > ok 1 - suite > > > > EOF > > > > > > > > This produces the following output (timestamps removed) > > > > > > > > ============================================================ > > > > ==================== suite (1 subtest) ===================== > > > > =========================== case =========================== > > > > ====================== [PASSED] case ======================= > > > > ====================== [PASSED] suite ====================== > > > > ============================================================ > > > > > > > > Should we surface some sort of error here? > > > > > > I thought about this a bit (and started prototyping it), and think the > > > answer is probably "no" (or, perhaps, "optionally"). Largely because I > > > think it'd be technically valid to have, e.g., a parameterised test > > > whose generator function can legitimately provide zero subtests. And > > > > That's the question. Should we report PASSED in that case as we do now? > > > > Let's consider parameterised tests, our only current example in KUnit. > > > > I think in most cases, it's a bug that if we got 0 cases and we should > > let the user know somehow. > > Should it be an error/warning? Maybe not, but wouldn't it be better to > > report SKIPPED? > > (This would require a change in KUnit on the kernel side, I'm not > > suggesting we do this in the parser) > > > > Yeah: there are two sorf-of separable decisions here: > 1) What result should a test with no subtests return? > 2) Do we want to trigger any other errors/warnings. > > I think the answer to 1 is that kunit_tool should report the result > printed in the KTAP output. I agree that, for parameterised tests, > though, that SKIPPED makes more sense than PASSED. (kunit_tool has a > separate NO_TESTS result, which we could maybe try to generate and > handle explicitly. I think we might as well leave that for the "no > tests run at all" case for now.) > > For 2, I feel that this definitely should count as a "warning", but > all we have at the moment are "errors", which I feel is probably a bit > too strong a term for this. Given errors don't actually halt parsing, > I'm okay with generating them in kunit_tool in this case, but I'd > probably slightly prefer to leave it with SKIPPED, and maybe add a > warning later. I am OK marking it as SKIPPED, but I like the idea of promoting it to a warning in a future change. Completely ignoring an empty test suite seems wrong, especially when we *do* complain when there *is* a test plan, and not all test cases are accounted for. My 2c. > > > while that's probably worth warning about if it's the only test > > > running, if you're trying to run all tests, and one random subtest of > > > a test of a suite has no subtests, that seems like it'd be more > > > annoying to error on than anything else. > > > > > > That being said, I'm not opposed to implementing it as an option, or > > > at least having the test status set to NO_ERROR. The implementation > > > I've experimented with basically moves the check to "parse_test", and > > > errors if the number of subtests is 0 after parsing, if parent_test is > > > true (or main, but my rough plan was to make main imply parent_test, > > > and adjust the various conditions to match). I haven't looked into > > > exactly how this is bubbled up yet, but I'd be okay with having an > > > error if there are no tests run at all. > > > > > > I'll keep playing with this anyway: it's definitely a bit more of a > > > minefield than I'd originally thought. :-) > > > > > > -- David > > > > > > > > > > > > > > > > return False > > > > > test.log.append(lines.pop()) > > > > > expected_count = int(match.group(1)) > > > > > diff --git a/tools/testing/kunit/kunit_tool_test.py b/tools/testing/kunit/kunit_tool_test.py > > > > > index 9c4126731457..bc8793145713 100755 > > > > > --- a/tools/testing/kunit/kunit_tool_test.py > > > > > +++ b/tools/testing/kunit/kunit_tool_test.py > > > > > @@ -191,7 +191,10 @@ class KUnitParserTest(unittest.TestCase): > > > > > result = kunit_parser.parse_run_tests( > > > > > kunit_parser.extract_tap_lines( > > > > > file.readlines())) > > > > > - self.assertEqual(2, result.test.counts.errors) > > > > > + # A missing test plan is not an error. > > > > > + self.assertEqual(0, result.test.counts.errors) > > > > > + # All tests should be accounted for. > > > > > + self.assertEqual(10, result.test.counts.total()) > > > > > self.assertEqual( > > > > > kunit_parser.TestStatus.SUCCESS, > > > > > result.status) > > > > > -- > > > > > 2.33.0.1079.g6e70778dc9-goog > > > > >