From f021a1b6b001d23e306e78fe2648e19227cf2dac Mon Sep 17 00:00:00 2001 From: andronache Date: Mon, 8 Feb 2021 12:30:03 +0200 Subject: [PATCH] Tests in Services --- services/datadb_it_test.go | 5 +++++ services/stordb_it_test.go | 26 ++++++++++++++++++++++---- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/services/datadb_it_test.go b/services/datadb_it_test.go index cc246060a..8fa2750d9 100644 --- a/services/datadb_it_test.go +++ b/services/datadb_it_test.go @@ -190,6 +190,11 @@ func TestDataDBReload(t *testing.T) { if !reflect.DeepEqual(oldcfg, db.oldDBCfg) { t.Errorf("Expected %s \n received:%s", utils.ToJSON(oldcfg), utils.ToJSON(db.oldDBCfg)) } + err := db.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } + cfg.AttributeSCfg().Enabled = false cfg.GetReloadChan(config.DATADB_JSN) <- struct{}{} time.Sleep(10 * time.Millisecond) diff --git a/services/stordb_it_test.go b/services/stordb_it_test.go index af7446a70..06253fd07 100644 --- a/services/stordb_it_test.go +++ b/services/stordb_it_test.go @@ -35,7 +35,6 @@ import ( func TestStorDBReload(t *testing.T) { cfg := config.NewDefaultCGRConfig() - utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) @@ -48,7 +47,7 @@ func TestStorDBReload(t *testing.T) { srvMngr := servmanager.NewServiceManager(cfg, shdChan, shdWg) srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} db := NewDataDBService(cfg, nil, srvDep) - cfg.StorDbCfg().Type = utils.INTERNAL + cfg.StorDbCfg().Password = "CGRateS.org" stordb := NewStorDBService(cfg, srvDep) anz := NewAnalyzerService(cfg, server, filterSChan, shdChan, make(chan rpcclient.ClientConnector, 1), srvDep) chrS := NewChargerService(cfg, db, chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz, srvDep) @@ -84,7 +83,10 @@ func TestStorDBReload(t *testing.T) { } else if reply != utils.OK { t.Errorf("Expecting OK ,received %s", reply) } - + err := stordb.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } if err := cfg.V1ReloadConfig(&config.ReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo"), Section: config.STORDB_JSN, @@ -106,7 +108,22 @@ func TestStorDBReload(t *testing.T) { t.Errorf("Expected service to be running") } - err := cdrS.Reload() + err = cdrS.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } + + err = stordb.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } + cfg.StorDbCfg().Type = utils.INTERNAL + err = stordb.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } + + err = stordb.Reload() if err != nil { t.Errorf("\nExpecting ,\n Received <%+v>", err) } @@ -119,6 +136,7 @@ func TestStorDBReload(t *testing.T) { if err != nil { t.Errorf("\nExpecting ,\n Received <%+v>", err) } + cfg.CdrsCfg().Enabled = false cfg.GetReloadChan(config.CDRS_JSN) <- struct{}{} time.Sleep(10 * time.Millisecond)