@@ -710,60 +710,61 @@ func Test_aggregateResponses(t *testing.T) {
710
710
{
711
711
name : "Return input value with only one response" ,
712
712
responses : map [string ]runtimehooksv1.ResponseObject {
713
- "first" : fakeResponse (runtimehooksv1 . ResponseStatusFailure , "This is a failure of a hook" , 5 ),
713
+ "first" : fakeResponse (5 ),
714
714
},
715
- want : fakeResponse (runtimehooksv1 . ResponseStatusFailure , "first: This is a failure of a hook" , 5 ),
715
+ want : fakeResponse (5 ),
716
716
},
717
717
{
718
718
name : "Success if no response is a failure" ,
719
719
responses : map [string ]runtimehooksv1.ResponseObject {
720
- "first" : fakeResponse (runtimehooksv1 . ResponseStatusSuccess , "" , 5 ),
721
- "second" : fakeResponse (runtimehooksv1 . ResponseStatusSuccess , "" , 1 ),
722
- "third" : fakeResponse (runtimehooksv1 . ResponseStatusSuccess , "" , 2 ),
723
- "fourth" : fakeResponse (runtimehooksv1 . ResponseStatusSuccess , "a failure" , 5 ),
720
+ "first" : fakeResponse (5 ),
721
+ "second" : fakeResponse (1 ),
722
+ "third" : fakeResponse (2 ),
723
+ "fourth" : fakeResponse (5 ),
724
724
},
725
- want : fakeResponse (runtimehooksv1 . ResponseStatusSuccess , "fourth: a failure" , 1 ),
725
+ want : fakeResponse (1 ),
726
726
},
727
727
{
728
728
name : "Failure if any response is a failure" ,
729
729
responses : map [string ]runtimehooksv1.ResponseObject {
730
- "first" : fakeResponse (runtimehooksv1 . ResponseStatusSuccess , "" , 5 ),
731
- "second" : fakeResponse (runtimehooksv1 . ResponseStatusSuccess , "" , 1 ),
732
- "third" : fakeResponse (runtimehooksv1 . ResponseStatusSuccess , "" , 2 ),
733
- "fourth" : fakeResponse (runtimehooksv1 . ResponseStatusFailure , "a failure" , 5 ),
730
+ "first" : fakeResponse (5 ),
731
+ "second" : fakeResponse (1 ),
732
+ "third" : fakeResponse (2 ),
733
+ "fourth" : fakeResponse (5 ),
734
734
},
735
- want : fakeResponse (runtimehooksv1 . ResponseStatusFailure , "fourth: a failure" , 1 ),
735
+ want : fakeResponse (1 ),
736
736
},
737
737
738
738
{
739
739
name : "Return lowest non-zero response for retry seconds" ,
740
740
responses : map [string ]runtimehooksv1.ResponseObject {
741
- "first" : fakeResponse (runtimehooksv1 . ResponseStatusFailure , "This is a failure of a hook" , 5 ),
742
- "second" : fakeResponse (runtimehooksv1 . ResponseStatusFailure , "another failure" , 1 ),
741
+ "first" : fakeResponse (5 ),
742
+ "second" : fakeResponse (1 ),
743
743
},
744
- want : fakeResponse (runtimehooksv1 . ResponseStatusFailure , "first: This is a failure of a hook \n second: another failure" , 1 ),
744
+ want : fakeResponse (1 ),
745
745
},
746
746
}
747
747
for _ , tt := range tests {
748
748
t .Run (tt .name , func (t * testing.T ) {
749
- got := aggregateResponses (tt .responses )
750
- if ! reflect .DeepEqual (got , tt .want ) {
751
- t .Errorf ("aggregateResponses() got = %v, want %v" , got , tt .want )
749
+ response := & fakev1alpha1.FakeRetryableResponse {TypeMeta : metav1.TypeMeta {Kind : "FakeResponse" , APIVersion : "v1alpha1" }}
750
+ aggregateSuccessfulResponses (response , tt .responses )
751
+ if ! reflect .DeepEqual (response , tt .want ) {
752
+ t .Errorf ("aggregateSuccessfulResponses() got = %v, want %v" , response , tt .want )
752
753
}
753
754
})
754
755
}
755
756
}
756
757
757
- func fakeResponse (status runtimehooksv1. ResponseStatus , message string , retryAfterSeconds int32 ) * fakev1alpha1.FakeRetryableResponse {
758
+ func fakeResponse (retryAfterSeconds int32 ) * fakev1alpha1.FakeRetryableResponse {
758
759
return & fakev1alpha1.FakeRetryableResponse {
759
760
TypeMeta : metav1.TypeMeta {
760
761
Kind : "FakeResponse" ,
761
762
APIVersion : "v1alpha1" ,
762
763
},
763
764
RetryableResponse : runtimehooksv1.RetryableResponse {
764
765
CommonResponse : runtimehooksv1.CommonResponse {
765
- Message : message ,
766
- Status : status ,
766
+ Message : "" ,
767
+ Status : runtimehooksv1 . ResponseStatusSuccess ,
767
768
},
768
769
RetryAfterSeconds : retryAfterSeconds ,
769
770
},
0 commit comments