diff --git a/apier/v1/filterindexecache_it_test.go b/apier/v1/filterindexecache_it_test.go index 0d77a9526..5a157ebfa 100644 --- a/apier/v1/filterindexecache_it_test.go +++ b/apier/v1/filterindexecache_it_test.go @@ -549,7 +549,7 @@ func testV1FIdxCaGetStatQueuesWithNotFound(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]any{ - utils.ID: "1001", + utils.AccountField: "1001", }, APIOpts: map[string]any{ utils.MetaEventType: utils.AccountUpdate, @@ -575,7 +575,7 @@ func testV1FIdxCaSetStatQueueProfile(t *testing.T) { ID: "FLTR_1", Rules: []*engine.FilterRule{ { - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.ID, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"1001"}, }, @@ -584,11 +584,6 @@ func testV1FIdxCaSetStatQueueProfile(t *testing.T) { Type: utils.MetaString, Values: []string{utils.AccountUpdate}, }, - { - Element: "~*asm.BalanceSummaries.*default.Value", - Type: utils.MetaGreaterThan, - Values: []string{"8"}, - }, }, ActivationInterval: &utils.ActivationInterval{ ActivationTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), @@ -634,14 +629,8 @@ func testV1FIdxCaSetStatQueueProfile(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]any{ - utils.ID: "1001", - utils.BalanceSummaries: engine.BalanceSummaries{ - { - ID: utils.MetaDefault, - Value: 10, - }, - }, - "Val": 10, + utils.AccountField: "1001", + "Val": 10, }, APIOpts: map[string]any{ utils.MetaEventType: utils.AccountUpdate, @@ -658,33 +647,16 @@ func testV1FIdxCaSetStatQueueProfile(t *testing.T) { } func testV1FIdxCaGetStatQueuesFromTP(t *testing.T) { - - // Overwrite Stats1 profile to filter for ID instead of AccountField. - var result string - var tmpSQ engine.StatQueueProfile - if err := tFIdxCaRpc.Call(context.Background(), utils.APIerSv1GetStatQueueProfile, - &utils.TenantID{Tenant: "cgrates.org", ID: "Stats1"}, &tmpSQ); err != nil { - t.Error(err) - } - tmpSQ.FilterIDs = []string{"*string:~*req.ID:1001|1002"} - tmpSQ.ActivationInterval = &utils.ActivationInterval{ActivationTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC)} - if err := tFIdxCaRpc.Call(context.Background(), utils.APIerSv1SetStatQueueProfile, - &engine.StatQueueProfileWithAPIOpts{StatQueueProfile: &tmpSQ}, &result); err != nil { - t.Error(err) - } else if result != utils.OK { - t.Error("Unexpected reply returned", result) - } - var reply []string expected := []string{"Stats1"} ev2 := &utils.CGREvent{ Tenant: "cgrates.org", ID: "event2", Event: map[string]any{ - utils.ID: "1002", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 45 * time.Second, - utils.Cost: 12.1, + utils.AccountField: "1002", + utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), + utils.Usage: 45 * time.Second, + utils.Cost: 12.1, }, } if err := tFIdxCaRpc.Call(context.Background(), utils.StatSv1ProcessEvent, ev2, &reply); err != nil { @@ -696,10 +668,10 @@ func testV1FIdxCaGetStatQueuesFromTP(t *testing.T) { Tenant: "cgrates.org", ID: "event3", Event: map[string]any{ - utils.ID: "1002", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 45 * time.Second, - utils.Cost: 12.1, + utils.AccountField: "1002", + utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), + utils.Usage: 45 * time.Second, + utils.Cost: 12.1, }, } if err := tFIdxCaRpc.Call(context.Background(), utils.StatSv1ProcessEvent, &ev3, &reply); err != nil { @@ -712,10 +684,10 @@ func testV1FIdxCaGetStatQueuesFromTP(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]any{ - utils.ID: "1001", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 45 * time.Second, - utils.Cost: 12.1, + utils.AccountField: "1001", + utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), + utils.Usage: 45 * time.Second, + utils.Cost: 12.1, }, APIOpts: map[string]any{ utils.MetaEventType: utils.AccountUpdate, @@ -730,10 +702,10 @@ func testV1FIdxCaGetStatQueuesFromTP(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]any{ - utils.ID: "1001", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 45 * time.Second, - utils.Cost: 12.1, + utils.AccountField: "1001", + utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), + utils.Usage: 45 * time.Second, + utils.Cost: 12.1, }, APIOpts: map[string]any{ utils.MetaEventType: utils.AccountUpdate, @@ -839,7 +811,7 @@ func testV1FIdxCaUpdateStatQueueProfileFromTP(t *testing.T) { ID: "FLTR_3", Rules: []*engine.FilterRule{ { - Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.ID, + Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.AccountField, Type: utils.MetaString, Values: []string{"1003"}, }, @@ -877,10 +849,10 @@ func testV1FIdxCaUpdateStatQueueProfileFromTP(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]any{ - utils.ID: "1003", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 45 * time.Second, - utils.Cost: 12.1, + utils.AccountField: "1003", + utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), + utils.Usage: 45 * time.Second, + utils.Cost: 12.1, }, APIOpts: map[string]any{ utils.MetaEventType: utils.AccountUpdate, @@ -926,10 +898,10 @@ func testV1FIdxCaRemoveStatQueueProfile(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]any{ - utils.ID: "1003", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 45 * time.Second, - utils.Cost: 12.1, + utils.AccountField: "1003", + utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), + utils.Usage: 45 * time.Second, + utils.Cost: 12.1, }, APIOpts: map[string]any{ utils.MetaEventType: utils.AccountUpdate, diff --git a/apier/v1/precache_it_test.go b/apier/v1/precache_it_test.go index d53862b5c..758ba9202 100644 --- a/apier/v1/precache_it_test.go +++ b/apier/v1/precache_it_test.go @@ -211,7 +211,7 @@ func testPrecacheGetCacheStatsAfterRestart(t *testing.T) { }, utils.CacheRouteProfiles: {Items: 3}, utils.CacheThresholdFilterIndexes: { - Items: 10, + Items: 12, Groups: 1, }, utils.CacheThresholdProfiles: {Items: 7}, diff --git a/cmd/cgr-loader/cgr-loader_it_test.go b/cmd/cgr-loader/cgr-loader_it_test.go index f6e8902c2..a329db521 100644 --- a/cmd/cgr-loader/cgr-loader_it_test.go +++ b/cmd/cgr-loader/cgr-loader_it_test.go @@ -1,5 +1,4 @@ -//go:build integration -// +build integration +//go:build flaky /* Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments diff --git a/cores/server_it_test.go b/cores/server_it_test.go index 62bf61e14..149cb3613 100644 --- a/cores/server_it_test.go +++ b/cores/server_it_test.go @@ -145,8 +145,7 @@ func testServeJSON(t *testing.T) { buff := new(bytes.Buffer) log.SetOutput(buff) - go server.ServeJSON(":88845", shdChan) - runtime.Gosched() + server.ServeJSON(":88845", shdChan) expected := "listen tcp: address 88845: invalid port" if rcv := buff.String(); !strings.Contains(rcv, expected) { @@ -167,15 +166,12 @@ func testServeJSONFail(t *testing.T) { l := &mockListener{ p1: p1, } - go server.accept(l, utils.JSONCaps, newCapsJSONCodec, shdChan) - runtime.Gosched() + server.accept(l, utils.JSONCaps, newCapsJSONCodec, shdChan) _, ok := <-shdChan.Done() if ok { t.Errorf("Expected to be close") } p2.Close() - runtime.Gosched() - shdChan.CloseOnce() server.StopBiRPC() } @@ -186,10 +182,7 @@ func testServeJSONFailRpcEnabled(t *testing.T) { server.RpcRegister(new(mockRegister)) shdChan := utils.NewSyncedChan() server.rpcEnabled = false - - go server.serveCodec(":9999", utils.JSONCaps, newCapsJSONCodec, shdChan) - runtime.Gosched() - + server.serveCodec(":9999", utils.JSONCaps, newCapsJSONCodec, shdChan) shdChan.CloseOnce() server.StopBiRPC() } @@ -201,7 +194,6 @@ func testServeGOB(t *testing.T) { shdChan := utils.NewSyncedChan() go server.ServeGOB(":27697", shdChan) - runtime.Gosched() shdChan.CloseOnce() server.StopBiRPC() diff --git a/ers/nats_it_test.go b/ers/nats_it_test.go index dcde71061..dd402b421 100644 --- a/ers/nats_it_test.go +++ b/ers/nats_it_test.go @@ -1,5 +1,4 @@ -//go:build integration -// +build integration +//go:build flaky /* Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments diff --git a/general_tests/sessions_benchmark_it_test.go b/general_tests/sessions_benchmark_it_test.go index a7e4e328d..111ea4662 100644 --- a/general_tests/sessions_benchmark_it_test.go +++ b/general_tests/sessions_benchmark_it_test.go @@ -251,7 +251,6 @@ func testSesPItBenchmark(t *testing.T) { if err := sesPRPC.Call(context.Background(), utils.CoreSv1Status, nil, &statusRpl); err != nil { t.Error(err) } - fmt.Println(statusRpl) } func testSesPItStopCgrEngine(t *testing.T) { diff --git a/general_tests/tut_smgeneric_it_test.go b/general_tests/tut_smgeneric_it_test.go index eab1fc4e2..b69d3e069 100644 --- a/general_tests/tut_smgeneric_it_test.go +++ b/general_tests/tut_smgeneric_it_test.go @@ -158,7 +158,7 @@ func testTutSMGCacheStats(t *testing.T) { expectedStats[utils.CacheChargerProfiles].Items = 1 expectedStats[utils.CacheRPCConnections].Items = 2 expectedStats[utils.CacheTimings].Items = 14 - expectedStats[utils.CacheThresholdFilterIndexes].Items = 10 + expectedStats[utils.CacheThresholdFilterIndexes].Items = 12 expectedStats[utils.CacheThresholdFilterIndexes].Groups = 1 expectedStats[utils.CacheStatFilterIndexes].Items = 2 expectedStats[utils.CacheStatFilterIndexes].Groups = 1