From 2d21b4624ca71087aa393de91c5c51652b711645 Mon Sep 17 00:00:00 2001
From: "Babak K. Shandiz" <babakks@github.com>
Date: Fri, 11 Apr 2025 12:40:26 +0100
Subject: [PATCH] Test normal job run log is preferred over legacy one

Signed-off-by: Babak K. Shandiz <babakks@github.com>
---
 pkg/cmd/run/view/fixtures/run_log.zip | Bin 8148 -> 8646 bytes
 pkg/cmd/run/view/view_test.go         |  14 ++++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkg/cmd/run/view/fixtures/run_log.zip b/pkg/cmd/run/view/fixtures/run_log.zip
index 60701d9254cbcacdda1d9aff426de744b6d574d7..425ba09ddce377dc26bffb4eaf7cdc2c99bc92ab 100644
GIT binary patch
delta 408
zcmca&f6RG9i{RuvEF3<kle?p|obHy3GcYhX0kIB)41-C0a(;e}LRNl~LV0FMhC)(4
zkjP0*PfV^<NX$!7$V)9($jMJH)+?zf2@T<7VD|g_Bfa$RkI9JwN|W9B`NJNf8EOVJ
zRM!#?NHrd4G|YGw7UAhkn;Qk~`6lPdafM;JUIOR`1_nkT-qP44$UvfBSiydod{9m%
k0n-o2M*jyIO|FlCmVg3loxB8}9D^K#7C!?+n-Iv=0235_5&!@I

delta 33
jcmX@+e8ql4i{R!CAsapsRyGD8kO4v)J_d#+K@blBnui80

diff --git a/pkg/cmd/run/view/view_test.go b/pkg/cmd/run/view/view_test.go
index 2205a9031..2d150934f 100644
--- a/pkg/cmd/run/view/view_test.go
+++ b/pkg/cmd/run/view/view_test.go
@@ -2039,8 +2039,9 @@ func TestViewRun(t *testing.T) {
 //	├── 2_cool job with no step logs.txt
 //	├── 3_sad job with no step logs.txt
 //	├── -9999999999_legacy cool job with no step logs.txt
-//	└── -9999999999_legacy sad job with no step logs.txt
-
+//	├── -9999999999_legacy sad job with no step logs.txt
+//	├── 4_cool job with both legacy and new logs.txt
+//	└── -9999999999_cool job with both legacy and new logs.txt
 func Test_attachRunLog(t *testing.T) {
 	tests := []struct {
 		name             string
@@ -2149,6 +2150,15 @@ func Test_attachRunLog(t *testing.T) {
 			wantJobFilename: "-9999999999_legacy cool job with no step logs.txt",
 			wantStepMatch:   false,
 		},
+		{
+			name: "matching job name with both normal and legacy filename",
+			job: shared.Job{
+				Name: "cool job with both legacy and new logs",
+			},
+			wantJobMatch:    true,
+			wantJobFilename: "4_cool job with both legacy and new logs.txt",
+			wantStepMatch:   false,
+		},
 		{
 			name: "one job name is a suffix of another",
 			job: shared.Job{