From 8e76fc237e6f39bcc564089d1c195c22e87e065f Mon Sep 17 00:00:00 2001 From: nickolasdaniel Date: Mon, 11 Oct 2021 08:24:28 +0300 Subject: [PATCH] Fixed random failure in libdynamics_test.go --- utils/libdynamics_test.go | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/utils/libdynamics_test.go b/utils/libdynamics_test.go index 14944d070..7a288ef63 100644 --- a/utils/libdynamics_test.go +++ b/utils/libdynamics_test.go @@ -799,6 +799,9 @@ func TestMapToDynamicBoolOpts(t *testing.T) { } rcv := MapToDynamicBoolOpts(in) + sort.Slice(rcv, func(i, j int) bool { + return len(rcv[i].FilterIDs) > len(rcv[j].FilterIDs) + }) if !reflect.DeepEqual(exp, rcv) { t.Errorf("Expected %v \n but received \n %v", ToJSON(exp), ToJSON(rcv)) } @@ -877,18 +880,21 @@ func TestMapToDynamicDecimalBigOpts(t *testing.T) { if err != nil { t.Error(err) } + sort.Slice(rcv, func(i, j int) bool { + return len(rcv[i].FilterIDs) > len(rcv[j].FilterIDs) + }) if !reflect.DeepEqual(exp, rcv) { t.Errorf("Expected %v \n but received \n %v", ToJSON(exp), ToJSON(rcv)) } in = map[string]string{ - "fltr1;fltr2": "21c", - "fltr2": "3c", + "fltr1;fltr2": "3c", + "fltr2": "21c", } - errExp := "can't convert <21c> to decimal" + errExp := "can't convert <3c> to decimal" _, err = MapToDynamicDecimalBigOpts(in) if err == nil || err.Error() != errExp { - t.Errorf("Expected error: %s", errExp) + t.Errorf("Expected error: %s \n received \n %+v", errExp, err) } } @@ -909,6 +915,9 @@ func TestMapToDynamicDurationOpts(t *testing.T) { "fltr2": "8s", } rcv, err := MapToDynamicDurationOpts(in) + sort.Slice(rcv, func(i, j int) bool { + return len(rcv[i].FilterIDs) > len(rcv[j].FilterIDs) + }) if err != nil { t.Error(err) } @@ -939,6 +948,9 @@ func TestMapToDynamicInterfaceOpts(t *testing.T) { "fltr2": 2, } rcv := MapToDynamicInterfaceOpts(in) + sort.Slice(rcv, func(i, j int) bool { + return len(rcv[i].FilterIDs) > len(rcv[j].FilterIDs) + }) if !reflect.DeepEqual(exp, rcv) { t.Errorf("Expected %v \n but received \n %v", ToJSON(exp), ToJSON(rcv)) }