@@ -670,8 +670,8 @@ func Test_RegisterFromNodeAnnotations(t *testing.T) {
670
670
t .Errorf ("missing annotation: hami.io/node-handshake-dcu" )
671
671
return false
672
672
}
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 ))
675
675
if errHami != nil {
676
676
t .Errorf ("invalid time format in annotation 'hami.io/node-handshake': %v" , errHami )
677
677
return false
@@ -786,8 +786,8 @@ func Test_RegisterFromNodeAnnotations_NIL(t *testing.T) {
786
786
}
787
787
788
788
// 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 ))
791
791
792
792
if errHami != nil {
793
793
t .Errorf ("invalid time format in annotation 'hami.io/node-handshake': %v" , errHami )
@@ -837,3 +837,13 @@ func Test_RegisterFromNodeAnnotations_NIL(t *testing.T) {
837
837
})
838
838
}
839
839
}
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