From 0b062d87ec60603ba3f3f4b638abae546054d576 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Tue, 26 Jan 2021 12:47:59 +0200 Subject: [PATCH] Updated integration tests --- analyzers/analyzers_it_test.go | 2 + cmd/cgr-engine/cgr-engine.go | 2 +- config/navigablemap_test.go | 8 +- .../samples/analyzers_it_test/cgrates.json | 132 ------------------ dispatchers/responder_it_test.go | 2 + services/analyzers_it_test.go | 2 +- utils/logger_it_test.go | 2 + 7 files changed, 12 insertions(+), 138 deletions(-) delete mode 100644 data/conf/samples/analyzers_it_test/cgrates.json diff --git a/analyzers/analyzers_it_test.go b/analyzers/analyzers_it_test.go index e491ba883..bfa8bbd80 100644 --- a/analyzers/analyzers_it_test.go +++ b/analyzers/analyzers_it_test.go @@ -196,6 +196,8 @@ func testAnalyzerSChargerSv1ProcessEvent(t *testing.T) { } func testAnalyzerSV1Search(t *testing.T) { + // need to wait in order for the log gorutine to execute + time.Sleep(10 * time.Millisecond) var result []map[string]interface{} if err := anzRPC.Call(utils.AnalyzerSv1StringQuery, &QueryArgs{HeaderFilters: `+RequestEncoding:\*internal +RequestMethod:AttributeSv1\.ProcessEvent`}, &result); err != nil { t.Error(err) diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go index 81232ca32..f46a4e243 100644 --- a/cmd/cgr-engine/cgr-engine.go +++ b/cmd/cgr-engine/cgr-engine.go @@ -740,7 +740,7 @@ func main() { }() select { case <-shtdDone: - case <-time.After(10 * time.Second): //cfg.CoreSCfg().ShutdownTimeout): + case <-time.After(cfg.CoreSCfg().ShutdownTimeout): utils.Logger.Err(fmt.Sprintf("<%s> Failed to shutdown all subsystems in the given time", utils.ServiceManager)) } diff --git a/config/navigablemap_test.go b/config/navigablemap_test.go index a4b0edd7a..dc369447f 100644 --- a/config/navigablemap_test.go +++ b/config/navigablemap_test.go @@ -242,13 +242,13 @@ func TestNMAsXMLElements(t *testing.T) { func TestNMAsCGREvent(t *testing.T) { if cgrEv := NMAsCGREvent(nil, "cgrates.org", - utils.NestingSep,nil); cgrEv != nil { + utils.NestingSep, nil); cgrEv != nil { t.Errorf("expecting: %+v, \nreceived: %+v", utils.ToJSON(nil), utils.ToJSON(cgrEv.Event)) } nM := utils.NewOrderedNavigableMap() if cgrEv := NMAsCGREvent(nM, "cgrates.org", - utils.NestingSep,nil); cgrEv != nil { + utils.NestingSep, nil); cgrEv != nil { t.Errorf("expecting: %+v, \nreceived: %+v", utils.ToJSON(nil), utils.ToJSON(cgrEv.Event)) } @@ -329,8 +329,8 @@ func TestNMAsCGREvent(t *testing.T) { "FirstLevel2.Field6": "Value6", "Field4": "Val4", } - if cgrEv := NMAsCGREvent(nM, "cgrates.org", - utils.NestingSep,utils.NewOrderedNavigableMap()); cgrEv.Tenant != "cgrates.org" || + if cgrEv := NMAsCGREvent(nM, "cgrates.org", + utils.NestingSep, utils.NewOrderedNavigableMap()); cgrEv.Tenant != "cgrates.org" || cgrEv.Time == nil || !reflect.DeepEqual(eEv, cgrEv.Event) { t.Errorf("expecting: %+v, \nreceived: %+v", utils.ToJSON(eEv), utils.ToJSON(cgrEv.Event)) diff --git a/data/conf/samples/analyzers_it_test/cgrates.json b/data/conf/samples/analyzers_it_test/cgrates.json deleted file mode 100644 index 3d8581921..000000000 --- a/data/conf/samples/analyzers_it_test/cgrates.json +++ /dev/null @@ -1,132 +0,0 @@ -{ -// CGRateS Configuration file - - -"general": { - "log_level": 7, - "reply_timeout": "30s", -}, - - -"listen": { - "rpc_json": ":2012", - "rpc_gob": ":2013", - "http": ":2080", -}, - - -"data_db": { - "db_type": "mongo", - "db_name": "10", - "db_port": 27017, -}, - - -"stor_db": { - "db_type": "mongo", - "db_name": "cgrates", - "db_port": 27017, -}, - - -"rals": { - "enabled": true, - "thresholds_conns": ["*internal"], - "max_increments":3000000, -}, - - -"schedulers": { - "enabled": true, - "cdrs_conns": ["*localhost"], -}, - - -"cdrs": { - "enabled": true, -}, - - -"chargers": { - "enabled": true, - "attributes_conns": ["*internal"], -}, - - -"resources": { - "enabled": true, - "store_interval": "1s", - "thresholds_conns": ["*internal"] -}, - - -"stats": { - "enabled": true, - "store_interval": "1s", - "thresholds_conns": ["*internal"], -}, - - -"thresholds": { - "enabled": true, - "store_interval": "1s", -}, - - -"routes": { - "enabled": true, - "stats_conns": ["*localhost"], - "resources_conns": ["*localhost"], - "rals_conns": ["*internal"], -}, - - -"attributes": { - "enabled": true, - "stats_conns": ["*localhost"], - "resources_conns": ["*localhost"], - "apiers_conns": ["*localhost"] -}, - - -"sessions": { - "enabled": true, - "rals_conns": ["*internal"], - "cdrs_conns": ["*internal"], - "chargers_conns": ["*internal"], -}, - - -"migrator": { - "out_datadb_type": "mongo", - "out_datadb_port": "27017", - "out_datadb_name": "10", - "out_stordb_type": "mongo", - "out_stordb_port": "27017", - "out_stordb_name": "cgrates", - "users_filters":["Account"], -}, - - -"apiers": { - "enabled": true, - "scheduler_conns": ["*internal"], -}, - - -"rates": { - "enabled": true -}, - - -"filters": { - "apiers_conns": ["*internal"], -}, - - -"analyzers":{ // AnalyzerS config - "enabled": true, // starts AnalyzerS service: . -}, - - -} diff --git a/dispatchers/responder_it_test.go b/dispatchers/responder_it_test.go index 29094955a..fbccb1efc 100644 --- a/dispatchers/responder_it_test.go +++ b/dispatchers/responder_it_test.go @@ -23,6 +23,7 @@ package dispatchers import ( "fmt" "testing" + "time" "github.com/cgrates/cgrates/utils" "github.com/cgrates/rpcclient" @@ -190,6 +191,7 @@ func testDspResponderBroadcast(t *testing.T) { t.Errorf("Expected error: %s received error: %v and reply %q", utils.ErrPartiallyExecuted.Error(), err, pingReply) } allEngine.stopEngine(t) + time.Sleep(10 * time.Millisecond) pingReply = "" if err := dispEngine.RPC.Call(utils.ResponderPing, pingEv, &pingReply); err == nil || !rpcclient.IsNetworkError(err) { diff --git a/services/analyzers_it_test.go b/services/analyzers_it_test.go index c6453fc30..d867747c8 100644 --- a/services/analyzers_it_test.go +++ b/services/analyzers_it_test.go @@ -61,7 +61,7 @@ func TestAnalyzerSReload(t *testing.T) { var reply string if err := cfg.V1ReloadConfig(&config.ReloadArgs{ - Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "analyzers_it_test"), + Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "analyzers"), Section: config.AnalyzerCfgJson, }, &reply); err != nil { t.Error(err) diff --git a/utils/logger_it_test.go b/utils/logger_it_test.go index 1b4a33357..1457e9e0d 100644 --- a/utils/logger_it_test.go +++ b/utils/logger_it_test.go @@ -27,6 +27,7 @@ import ( "runtime" "strings" "testing" + "time" ) var ( @@ -192,6 +193,7 @@ func testCriticalLogger(t *testing.T) { if err := writer.Close(); err != nil { t.Error(err) } + time.Sleep(100 * time.Millisecond) if err := l.Close(); err != nil { t.Error(err) }