From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH] progress.c tests: fix breakage with COLUMNS != 80
Date: Mon, 21 Jun 2021 09:01:23 +0200 [thread overview]
Message-ID: <patch-1.1-cba5d88ca35-20210621T070114Z-avarab@gmail.com> (raw)
The tests added in 2bb74b53a49 (Test the progress display, 2019-09-16)
broke under anything except COLUMNS=80, i.e. when running them under
the "-v" mode under a differently sized terminal.
Let's set the expected number of COLUMNS at the start of the test to
fix that bug. It's handy not do do this in test-progress.c itself, in
case we'd like to test for a different number of COLUMNS, either
manually or in a future test.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
t/t0500-progress-display.sh | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/t/t0500-progress-display.sh b/t/t0500-progress-display.sh
index 22058b503ac..66c092a0fe3 100755
--- a/t/t0500-progress-display.sh
+++ b/t/t0500-progress-display.sh
@@ -8,6 +8,11 @@ show_cr () {
tr '\015' Q | sed -e "s/Q/<CR>\\$LF/g"
}
+test_expect_success 'setup COLUMNS' '
+ COLUMNS=80 &&
+ export COLUMNS
+'
+
test_expect_success 'simple progress display' '
cat >expect <<-\EOF &&
Working hard: 1<CR>
--
2.32.0.595.g55105f1e212
next reply other threads:[~2021-06-21 7:01 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-21 7:01 Ævar Arnfjörð Bjarmason [this message]
2021-06-23 23:48 ` [PATCH] progress.c tests: fix breakage with COLUMNS != 80 Jeff King
2021-06-24 5:12 ` SZEDER Gábor
2021-06-24 5:40 ` Jeff King
2021-06-24 15:05 ` Philip Oakley
2021-06-24 10:19 ` [PATCH] test-lib.sh: set COLUMNS=80 for --verbose repeatability Ævar Arnfjörð Bjarmason
2021-06-24 14:50 ` Jeff King
2021-06-27 7:44 ` SZEDER Gábor
2021-06-29 1:42 ` Junio C Hamano
2021-06-29 11:29 ` [PATCH v2] " Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=patch-1.1-cba5d88ca35-20210621T070114Z-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).