Skip to content

Commit d1791fb

Browse files
refactor: streamline time parsing by introducing trimHandshakePrefix function
Signed-off-by: haitwang-cloud <[email protected]>
1 parent b7d0e66 commit d1791fb

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

pkg/scheduler/scheduler_test.go

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -670,8 +670,8 @@ func Test_RegisterFromNodeAnnotations(t *testing.T) {
670670
t.Errorf("missing annotation: hami.io/node-handshake-dcu")
671671
return false
672672
}
673-
_, errHami := time.Parse(time.DateTime, strings.TrimPrefix(handshakeTimeStr, "Requesting_"))
674-
_, errDcu := time.Parse(time.DateTime, strings.TrimPrefix(dcuTimeStr, "Requesting_"))
673+
_, errHami := time.Parse(time.DateTime, trimHandshakePrefix(handshakeTimeStr))
674+
_, errDcu := time.Parse(time.DateTime, trimHandshakePrefix(dcuTimeStr))
675675
if errHami != nil {
676676
t.Errorf("invalid time format in annotation 'hami.io/node-handshake': %v", errHami)
677677
return false
@@ -786,8 +786,8 @@ func Test_RegisterFromNodeAnnotations_NIL(t *testing.T) {
786786
}
787787

788788
// Verify time format in annotations if they exist
789-
_, errHami := time.Parse(time.DateTime, strings.TrimPrefix(handshakeTimeStr, "Requesting_"))
790-
_, errDcu := time.Parse(time.DateTime, strings.TrimPrefix(dcuTimeStr, "Requesting_"))
789+
_, errHami := time.Parse(time.DateTime, trimHandshakePrefix(handshakeTimeStr))
790+
_, errDcu := time.Parse(time.DateTime, trimHandshakePrefix(dcuTimeStr))
791791

792792
if errHami != nil {
793793
t.Errorf("invalid time format in annotation 'hami.io/node-handshake': %v", errHami)
@@ -837,3 +837,13 @@ func Test_RegisterFromNodeAnnotations_NIL(t *testing.T) {
837837
})
838838
}
839839
}
840+
841+
func trimHandshakePrefix(s string) string {
842+
prefixes := []string{"Requesting_", "Deleted_"}
843+
for _, p := range prefixes {
844+
if strings.HasPrefix(s, p) {
845+
return strings.TrimPrefix(s, p)
846+
}
847+
}
848+
return s
849+
}

0 commit comments

Comments
 (0)