From patchwork Wed Jul 5 18:35:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 13302637 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EBF1EB64DA for ; Wed, 5 Jul 2023 18:35:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232397AbjGESfw (ORCPT ); Wed, 5 Jul 2023 14:35:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232022AbjGESfv (ORCPT ); Wed, 5 Jul 2023 14:35:51 -0400 Received: from mail-lj1-x232.google.com (mail-lj1-x232.google.com [IPv6:2a00:1450:4864:20::232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1231011D for ; Wed, 5 Jul 2023 11:35:49 -0700 (PDT) Received: by mail-lj1-x232.google.com with SMTP id 38308e7fff4ca-2b703cbfaf5so3580031fa.1 for ; Wed, 05 Jul 2023 11:35:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688582147; x=1691174147; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wyhwhAzxgECd2fuSh9AR+oZdD1bXOgzHrQWPvxmNZ7o=; b=R/CfmDdeQJKjZAD3Wq5/uCNTOkSgYTybXoT5D8QED57r2ulXf6cw/MT1sD07Jew4E9 a0hOnfeW98f/J+MYeeihTZFFSlEeC3jb+CuCpBxbk73DRhGWHSDUvOSOl3zKCL3ulkhK J89H/KmfqU7+QaxGnBxJ7HNzepZb9HwHIJclSPQqdC0GhOQhwNbRqKZyFwiKOqu9Ay3/ XHddewENFflKLoysXP87rkhnI0PLO3PiDqIsIdp+aje4uvANaHR2HEPD/qUkTBKNQyg0 EWbfnYjck/VaNxjwvP8MII8TImQrrl8bdNTUbKgJDQ4Bvqz4tfkAADP/44LCbFqGHFAy AIBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688582147; x=1691174147; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wyhwhAzxgECd2fuSh9AR+oZdD1bXOgzHrQWPvxmNZ7o=; b=fwoDEwe2JIm+tC/oymovDbiyPdGga/uAP79SWQgNmUuUbuB4Rl09QcXYvuU10EcVA2 vnetYveUU2l8gBjLuFLjL0cEmH6EbXLMrMgyk91pq0F8ODXF9foNOh8JzeNoP1bFQpMT s289kq31f78LqQFrni03P9coF9qhelHtSRCV8ZjqIU0XiBmz0ZqbcqlQQus+aGxHlRfo 5qPZhN8HKod8JqXppd5Q2ZGAw/gPMlOtVwZId8/Au6r378H8IfWhBjHU29MPD3VpTb6A JPtc393waC5AGcZfF8WG3+C44Tjl7IVskRncpnULiZ2ce81sON/s4t5ABuf9LLJI6SJ2 tirA== X-Gm-Message-State: ABy/qLY6pruhwN0VYgmwj1jvC28qPKBaB9W41TLyQtttJvWG47uTG2Ow EembgAR2W2nXQEWGUKOyc8nB8jsmXds= X-Google-Smtp-Source: APBJJlEViXwrCFKVjJ/SYQDLI+wPkNGjeEh/e0Kqs28T3mt4uLqBHQWAIX2uSTPmapdv2iSqmPjQKg== X-Received: by 2002:a2e:911a:0:b0:2b4:83c3:d285 with SMTP id m26-20020a2e911a000000b002b483c3d285mr12682970ljg.38.1688582146327; Wed, 05 Jul 2023 11:35:46 -0700 (PDT) Received: from localhost.localdomain (2-248-185-180-no600.tbcn.telia.com. [2.248.185.180]) by smtp.gmail.com with ESMTPSA id y20-20020a2eb014000000b002b6d7bcf665sm3358330ljk.71.2023.07.05.11.35.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jul 2023 11:35:45 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: Phillip Wood , Emily Shaffer , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= , Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= Subject: [PATCH v3] t0091-bugreport.sh: actually verify some content of report Date: Wed, 5 Jul 2023 20:35:27 +0200 Message-ID: <20230705183532.3057433-1-martin.agren@gmail.com> X-Mailer: git-send-email 2.41.0.404.g5b50783d6b In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org In the first test in this script, 'creates a report with content in the right places', we generate a report and pipe it into our helper `check_all_headers_populated()`. The idea of the helper is to find all lines that look like headers ("[Some Header Here]") and to check that the next line is non-empty. This is supposed to catch erroneous outputs such as the following: [A Header] something more here [Another Header] [Too Early Header] contents However, we provide the lines of the bug report as filenames to grep, meaning we mostly end up spewing errors: grep: : No such file or directory grep: [System Info]: No such file or directory grep: git version:: No such file or directory grep: git version 2.41.0.2.gfb7d80edca: No such file or directory This doesn't disturb the test, which tugs along and reports success, not really having verified the contents of the report at all. Note that after 788a776069 ("bugreport: collect list of populated hooks", 2020-05-07), the bug report, which is created in our hook-less test repo, contains an empty section with the enabled hooks. Thus, even the intention of our helper is a bit misguided: there is nothing inherently wrong with having an empty section in the bug report. Let's instead split this test into three: first verify that we generate a report at all, then check that the introductory blurb looks the way it should, then verify that the "[System Info]" seems to contain the right things. (The "[Enabled Hooks]" section is tested later in the script.) Reported-by: SZEDER Gábor Helped-by: Phillip Wood Signed-off-by: Martin Ågren --- t/t0091-bugreport.sh | 67 +++++++++++++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 23 deletions(-) diff --git a/t/t0091-bugreport.sh b/t/t0091-bugreport.sh index b6d2f591ac..f6998269be 100755 --- a/t/t0091-bugreport.sh +++ b/t/t0091-bugreport.sh @@ -5,29 +5,50 @@ test_description='git bugreport' TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh -# Headers "[System Info]" will be followed by a non-empty line if we put some -# information there; we can make sure all our headers were followed by some -# information to check if the command was successful. -HEADER_PATTERN="^\[.*\]$" - -check_all_headers_populated () { - while read -r line - do - if test "$(grep "$HEADER_PATTERN" "$line")" - then - echo "$line" - read -r nextline - if test -z "$nextline"; then - return 1; - fi - fi - done -} - -test_expect_success 'creates a report with content in the right places' ' - test_when_finished rm git-bugreport-check-headers.txt && - git bugreport -s check-headers && - check_all_headers_populated actual && + cat >expect <<-\EOF && + Thank you for filling out a Git bug report! + Please answer the following questions to help us understand your issue. + + What did you do before the bug happened? (Steps to reproduce your issue) + + What did you expect to happen? (Expected behavior) + + What happened instead? (Actual behavior) + + What'\''s different between what you expected and what actually happened? + + Anything else you want to add: + + Please review the rest of the bug report below. + You can delete any lines you don'\''t wish to share. + + + EOF + test_cmp expect actual +' + +test_expect_success 'sanity check "System Info" section' ' + test_when_finished rm -f git-bugreport-format.txt && + + sed -ne "/^\[System Info\]$/,/^$/p" system && + + # The beginning should match "git version --build-info" verbatim, + # but rather than checking bit-for-bit equality, just test some basics. + grep "git version [0-9]." system && + grep "shell-path: ." system && + + # After the version, there should be some more info. + # This is bound to differ from environment to environment, + # so we just do some rather high-level checks. + grep "uname: ." system && + grep "compiler info: ." system ' test_expect_success 'dies if file with same name as report already exists' '