progress: Render never started trackers properly

jedib0t · Aug 24, 2023 · bde06a9 · bde06a9
1 parent bb0bb0b
commit bde06a9
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 4 deletions.
diff --git a/progress/render.go b/progress/render.go
@@ -412,10 +412,12 @@ func (p *Progress) renderTrackerStatsSpeedInternal(out *strings.Builder, speed s
 
 func (p *Progress) renderTrackerStatsTime(outStats *strings.Builder, t *Tracker, hint renderHint) {
 	var td, tp time.Duration
-	if t.IsDone() {
-		td = t.timeStop.Sub(t.timeStart)
-	} else if !t.timeStart.IsZero() {
-		td = time.Since(t.timeStart)
+	if !t.timeStart.IsZero() {
+		if t.IsDone() {
+			td = t.timeStop.Sub(t.timeStart)
+		} else {
+			td = time.Since(t.timeStart)
+		}
 	}
 	if hint.isOverallTracker {
 		tp = p.style.Options.TimeOverallPrecision

diff --git a/progress/render_test.go b/progress/render_test.go
@@ -338,6 +338,34 @@ func TestProgress_generateTrackerStr_Indeterminate(t *testing.T) {
 	}
 }
 
+func TestProgress_RenderNeverStarted(t *testing.T) {
+	renderOutput := strings.Builder{}
+
+	pw := generateWriter()
+	pw.SetOutputWriter(&renderOutput)
+
+	tr := &Tracker{DeferStart: true}
+	pw.AppendTracker(tr)
+
+	go pw.Render()
+	time.Sleep(renderWaitTime)
+	tr.MarkAsDone()
+	pw.Stop()
+	time.Sleep(time.Second)
+
+	expectedOutPatterns := []*regexp.Regexp{
+		regexp.MustCompile(`\s*\.\.\. {2}\?\?\? {2}\[\.{23}] \[0 in 0s]`),
+		regexp.MustCompile(`\s*\.\.\. done! \[0 in 0s]`),
+	}
+	out := renderOutput.String()
+	for _, expectedOutPattern := range expectedOutPatterns {
+		if !expectedOutPattern.MatchString(out) {
+			assert.Fail(t, "Failed to find a pattern in the Output.", expectedOutPattern.String())
+		}
+	}
+	showOutputOnFailure(t, out)
+}
+
 func TestProgress_RenderNothing(t *testing.T) {
 	renderOutput := outputWriter{}