Merge branch 'main' into vsukhin/feature/cronjob-config

kubeshop · Oct 29, 2024 · ccd9e99 · ccd9e99
2 parents e7d2398 + 806d787
commit ccd9e99
Showing 1 changed file with 20 additions and 14 deletions.
diff --git a/cmd/kubectl-testkube/commands/testworkflows/run.go b/cmd/kubectl-testkube/commands/testworkflows/run.go
@@ -340,7 +340,7 @@ func printRawLogLines(logs []byte, steps []testkube.TestWorkflowSignature, resul
 			logs = nil
 		} else {
 			line = string(logs[:newLineIndex])
-			logs = logs[newLineIndex+1:]
+			logs = logs[newLineIndex+len(NL):]
 		}
 
 		line = trimTimestamp(line)
@@ -354,28 +354,34 @@ func printRawLogLines(logs []byte, steps []testkube.TestWorkflowSignature, resul
 
 		nextRef := start[1]
 
-		for i == -1 || steps[i].Ref != nextRef {
+		for i == -1 || (i < len(steps) && steps[i].Ref != nextRef) {
 			if ps, ok := results[currentRef]; ok && ps.Status != nil {
 				took := ps.FinishedAt.Sub(ps.QueuedAt).Round(time.Millisecond)
-				printStatus(steps[i], *ps.Status, took, i, len(steps), steps[i].Label())
+				if i != -1 {
+					printStatus(steps[i], *ps.Status, took, i, len(steps), steps[i].Label())
+				}
 			}
 
 			i++
-			currentRef = steps[i].Ref
-			printStatusHeader(i, len(steps), steps[i].Label())
+			if i < len(steps) {
+				currentRef = steps[i].Ref
+				printStatusHeader(i, len(steps), steps[i].Label())
+			}
 		}
 	}
 
-	for _, step := range steps[i:] {
-		if ps, ok := results[currentRef]; ok && ps.Status != nil {
-			took := ps.FinishedAt.Sub(ps.QueuedAt).Round(time.Millisecond)
-			printStatus(step, *ps.Status, took, i, len(steps), steps[i].Label())
-		}
+	if i != -1 && i < len(steps) {
+		for _, step := range steps[i:] {
+			if ps, ok := results[currentRef]; ok && ps.Status != nil {
+				took := ps.FinishedAt.Sub(ps.QueuedAt).Round(time.Millisecond)
+				printStatus(step, *ps.Status, took, i, len(steps), steps[i].Label())
+			}
 
-		i++
-		currentRef = step.Ref
-		if i < len(steps) {
-			printStatusHeader(i, len(steps), steps[i].Label())
+			i++
+			currentRef = step.Ref
+			if i < len(steps) {
+				printStatusHeader(i, len(steps), steps[i].Label())
+			}
 		}
 	}
 }