From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 3F6C21F4B4 for ; Mon, 11 Jan 2021 14:49:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388903AbhAKOtA (ORCPT ); Mon, 11 Jan 2021 09:49:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730316AbhAKOs6 (ORCPT ); Mon, 11 Jan 2021 09:48:58 -0500 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 58A65C0617A5 for ; Mon, 11 Jan 2021 06:47:54 -0800 (PST) Received: by mail-wm1-x32f.google.com with SMTP id c133so76567wme.4 for ; Mon, 11 Jan 2021 06:47:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lgPdgpDalCDWoOWPapkcl01j3Lxl4yv+JYju5Yd2zK8=; b=brvjdMq9VvcEzcNDptyYaPEzdp52GfIKvz4LJ+OS9O0iVvCbvsqF9ItLKkYLK06u3i m1LODk6K1BzMonoP1gKcf3uP1ICIhDKFbNX6q1J3z5InJMNRxtlUQS8Sd80LPeJlkBHU B6dJeWpQeIdDd1ofgfv16AManOUCUdkpxwHbnOVdlzbAkm/cbr7i3TfD3ol36sbLCHjk mazaKpBbHG3EvEHV6MfeMIzQu4yQTsqSWHiQBRzUgjiGAYh8YVZOrjh9PbeegwEbHBtO scAXEZb+M/oCaNIjJI9eNh9tcg1nF2flq0HKWn8Wqwhjk/Vp3J9WoaQ6FgCO17wFcal9 0A3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lgPdgpDalCDWoOWPapkcl01j3Lxl4yv+JYju5Yd2zK8=; b=U0iIPyIKQ6RM1YrWFa1RZvjWVUyH8Y1AIEdurQ8V1LXI3TjH6K6aDUbkcWCvNNldDT YLPq5zaajnMzbDLrSxNyc/LDet7+XgGHnXhsRiCvzfr32pbgHTxODjEdgW7F23Id+hzf snjhuOx/5NhjTuwvor9vV1wVHXnWDx7tpfrFWYxhSNfbDBaF5KsVf8/6BFqAyKeaRAzc UwUojuYsiviJoPOIhH/FVMjJJQw5Lp6Ry05OjSUk9j/Is7ZTVhrVxZiM/z/PME7eDFS3 N4Rr2UZU6KJzlAtBtMfeOj92fh/zwTXhyiVguCPYkw/BTjOABQ5z2NOZw4WYn2OoC09M oBwQ== X-Gm-Message-State: AOAM531DaUP3uerlYWvk1g4Tbw3AQgtn8e3Z3DYoXZ0D9ecSiCUvJZS1 LCDTMTTITWn/63nETjSo3Bi8StObEs82/Q== X-Google-Smtp-Source: ABdhPJyxEYUhwsNSWew6YVQYZ7Fh0Q9QvK+ad06HrSXZw969wmriWS6a9468ANklYMDYKtz7sX71Fw== X-Received: by 2002:a1c:6283:: with SMTP id w125mr33968wmb.155.1610376472794; Mon, 11 Jan 2021 06:47:52 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id m5sm26132697wrz.18.2021.01.11.06.47.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Jan 2021 06:47:52 -0800 (PST) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , =?UTF-8?q?SZEDER=20G=C3=A1bor?= , Johannes Schindelin , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= , Jiang Xin , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH 6/6] tests: remove uses of GIT_TEST_GETTEXT_POISON=false Date: Mon, 11 Jan 2021 15:47:40 +0100 Message-Id: <20210111144740.6092-7-avarab@gmail.com> X-Mailer: git-send-email 2.29.2.222.g5d2a92d10f8 In-Reply-To: <87pn2b6eyb.fsf@evledraar.gmail.com> References: <87pn2b6eyb.fsf@evledraar.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org As noted in previous commits we are removing the use of GIT_TEST_GETTEXT_POISON=false. These tests all relied on the facility being off, it always is off after an earlier change, but we hadn't removed the redundant assignments to "false" in the tests. I'm preserving the deletion of "error" lines in 38b9197a76a (t5411: add basic test cases for proc-receive hook, 2020-08-27), it turns out that's useful even without GIT_TEST_GETTEXT_POISON=true in play. Update a comment added in that commit to note that. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t1305-config-include.sh | 4 +--- t/t5411/common-functions.sh | 5 ++--- t/t7201-co.sh | 2 +- t/t9902-completion.sh | 1 - 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/t/t1305-config-include.sh b/t/t1305-config-include.sh index f1e1b289f9..f08cfcdfae 100755 --- a/t/t1305-config-include.sh +++ b/t/t1305-config-include.sh @@ -352,9 +352,7 @@ test_expect_success 'include cycles are detected' ' git init --bare cycle && git -C cycle config include.path cycle && git config -f cycle/cycle include.path config && - test_must_fail \ - env GIT_TEST_GETTEXT_POISON=false \ - git -C cycle config --get-all test.value 2>stderr && + test_must_fail git -C cycle config --get-all test.value 2>stderr && grep "exceeded maximum include depth" stderr ' diff --git a/t/t5411/common-functions.sh b/t/t5411/common-functions.sh index 344d13f61a..13107fcdb6 100644 --- a/t/t5411/common-functions.sh +++ b/t/t5411/common-functions.sh @@ -36,9 +36,8 @@ create_commits_in () { # without having to worry about future changes of the commit ID and spaces # of the output. Single quotes are replaced with double quotes, because # it is boring to prepare unquoted single quotes in expect text. We also -# remove some locale error messages, which break test if we turn on -# `GIT_TEST_GETTEXT_POISON=true` in order to test unintentional translations -# on plumbing commands. +# remove some locale error messages. The emitted human-readable errors are +# redundant to the more machine-readable output the tests already assert. make_user_friendly_and_stable_output () { sed \ -e "s/ *\$//" \ diff --git a/t/t7201-co.sh b/t/t7201-co.sh index b36a93056f..d10076efd7 100755 --- a/t/t7201-co.sh +++ b/t/t7201-co.sh @@ -245,7 +245,7 @@ test_expect_success 'checkout to detach HEAD' ' rev=$(git rev-parse --short renamer^) && git checkout -f renamer && git clean -f && - GIT_TEST_GETTEXT_POISON=false git checkout renamer^ 2>messages && + git checkout renamer^ 2>messages && grep "HEAD is now at $rev" messages && test_line_count -gt 1 messages && H=$(git rev-parse --verify HEAD) && diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index a1c4f1f6d4..e5adee27d4 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -2363,7 +2363,6 @@ test_expect_success 'sourcing the completion script clears cached commands' ' ' test_expect_success 'sourcing the completion script clears cached merge strategies' ' - GIT_TEST_GETTEXT_POISON=false && __git_compute_merge_strategies && verbose test -n "$__git_merge_strategies" && . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" && -- 2.29.2.222.g5d2a92d10f8