Add a "signal" synonym for "update". It is not typical of the
progress.c API to encounter a scenario where we do an update before
the first display_progress(), let's indicate this explicitly by
calling such instances "signal".
It's just a synonym for "update", but we can imagine than the
following "update" calls could elide many "progress" calls, and the
progress bar output will generally be of the same type, whereas the
output where we're asked to emit an update before we've received any
data is a special case.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
---
t/helper/test-progress.c | 6 +++++-
t/t0500-progress-display.sh | 10 +++++-----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/t/helper/test-progress.c b/t/helper/test-progress.c
index eb925d591e1..7ca58a3ee78 100644
--- a/t/helper/test-progress.c
+++ b/t/helper/test-progress.c
@@ -13,6 +13,9 @@
* specify the time elapsed since the
* start_progress() call.
* "update" - Set the 'progress_update' flag.
+ * "signal" - Synonym for "update", used for self-documenting tests,
+ * i.e. "expect signal here due to hanging ("signal")
+ * v.s. it was time to update ("update").
* "stop" - Call stop_progress().
*
* See 't0500-progress-display.sh' for examples.
@@ -78,7 +81,8 @@ int cmd__progress(int argc, const char **argv)
die("invalid input: '%s'\n", line.buf);
progress_test_ns = test_ms * 1000 * 1000;
display_throughput(progress, byte_count);
- } else if (!strcmp(line.buf, "update")) {
+ } else if (!strcmp(line.buf, "update") ||
+ !strcmp(line.buf, "signal")) {
progress_test_force_update();
} else if (!strcmp(line.buf, "stop")) {
stop_progress(&progress);
diff --git a/t/t0500-progress-display.sh b/t/t0500-progress-display.sh
index 50eced31f03..66c1989b176 100755
--- a/t/t0500-progress-display.sh
+++ b/t/t0500-progress-display.sh
@@ -23,7 +23,7 @@ test_expect_success 'simple progress display' '
cat >in <<-\EOF &&
start 0
- update
+ signal
progress 1
update
progress 2
@@ -197,7 +197,7 @@ test_expect_success 'progress display with throughput' '
cat >in <<-\EOF &&
start
throughput 102400 1000
- update
+ signal
progress 10
throughput 204800 2000
update
@@ -255,7 +255,7 @@ test_expect_success 'cover up after throughput shortens' '
cat >in <<-\EOF &&
start
throughput 409600 1000
- update
+ signal
progress 1
throughput 819200 2000
update
@@ -285,7 +285,7 @@ test_expect_success 'cover up after throughput shortens a lot' '
cat >in <<-\EOF &&
start
throughput 1 1000
- update
+ signal
progress 1
throughput 1024000 2000
update
@@ -305,7 +305,7 @@ test_expect_success 'progress generates traces' '
cat >in <<-\EOF &&
start 40
throughput 102400 1000
- update
+ signal
progress 10
throughput 204800 2000
update
--
2.32.0.599.g3967b4fa4ac
