From 0493dee315b052a8f7ce321ed4e3a833c561abf8 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Mon, 27 Jan 2025 11:34:26 -0500 Subject: [PATCH] Make timing outputs consistently show hours and hint at time format Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- .../main/scala/sbt/internal/client/NetworkClient.scala | 8 ++++---- main/src/test/scala/sbt/internal/AggregationSpec.scala | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala index ac86292e8..7cb25e8f3 100644 --- a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala +++ b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala @@ -1126,12 +1126,12 @@ object NetworkClient { val totalString = s"$total s" + (if (total <= 60) "" else { - val maybeHours = total / 3600 match - case 0 => "" - case h => f"$h%02d:" + val hours = total / 3600 match + case 0 => "0" + case h => f"$h%02d" val mins = f"${total % 3600 / 60}%02d" val secs = f"${total % 60}%02d" - s" ($maybeHours$mins:$secs)" + s" ($hours:$mins:$secs.0)" }) s"elapsed time: $totalString" diff --git a/main/src/test/scala/sbt/internal/AggregationSpec.scala b/main/src/test/scala/sbt/internal/AggregationSpec.scala index 04563c0ca..90cc2109c 100644 --- a/main/src/test/scala/sbt/internal/AggregationSpec.scala +++ b/main/src/test/scala/sbt/internal/AggregationSpec.scala @@ -17,10 +17,10 @@ object AggregationSpec extends verify.BasicTestSuite { assert(timing(3000).startsWith("elapsed time: 3 s")) assert(timing(30399).startsWith("elapsed time: 30 s")) assert(timing(60399).startsWith("elapsed time: 60 s")) - assert(timing(60699).startsWith("elapsed time: 61 s (01:01)")) - assert(timing(303099).startsWith("elapsed time: 303 s (05:03)")) - assert(timing(6003099).startsWith("elapsed time: 6003 s (01:40:03)")) - assert(timing(96003099).startsWith("elapsed time: 96003 s (26:40:03)")) + assert(timing(60699).startsWith("elapsed time: 61 s (0:01:01.0)")) + assert(timing(303099).startsWith("elapsed time: 303 s (0:05:03.0)")) + assert(timing(6003099).startsWith("elapsed time: 6003 s (01:40:03.0)")) + assert(timing(96003099).startsWith("elapsed time: 96003 s (26:40:03.0)")) } test("timing should not emit special space characters") {