From 6e84624e646ea4a82b3071a13976918134636b0a Mon Sep 17 00:00:00 2001 From: andronache Date: Fri, 12 Feb 2021 10:24:14 +0200 Subject: [PATCH] Tests in services --- services/analyzers_it_test.go | 13 ++++--- services/datadb_it_test.go | 69 +++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 6 deletions(-) diff --git a/services/analyzers_it_test.go b/services/analyzers_it_test.go index 3c8cc0718..9095ed8e7 100644 --- a/services/analyzers_it_test.go +++ b/services/analyzers_it_test.go @@ -20,6 +20,7 @@ along with this program. If not, see package services import ( + "log" "os" "path" "sync" @@ -124,16 +125,17 @@ func TestAnalyzerSReload2(t *testing.T) { anz.anz = nil } -/* func TestAnalyzerSReload3(t *testing.T) { cfg := config.NewDefaultCGRConfig() - if err := os.MkdirAll("/tmp/analyzers", 0700); err != nil { + if err := os.MkdirAll("/tmp/analyzers_test3", 0700); err != nil { t.Fatal(err) } - if err := os.MkdirAll("/tmp/analyzers_test", 0700); err != nil { - t.Fatal(err) + cfg.AnalyzerSCfg().DBPath = "/tmp/analyzers_test3" + err := os.RemoveAll("/tmp/analyzers_test3") + if err != nil { + log.Fatal(err) } - cfg.AnalyzerSCfg().DBPath = "/tmp/analyzers_test" + cfg.AnalyzerSCfg().IndexType = "" utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) shdChan := utils.NewSyncedChan() @@ -150,4 +152,3 @@ func TestAnalyzerSReload3(t *testing.T) { close(anz.stopChan) } -*/ diff --git a/services/datadb_it_test.go b/services/datadb_it_test.go index d9b3d45fd..ec547d17d 100644 --- a/services/datadb_it_test.go +++ b/services/datadb_it_test.go @@ -204,3 +204,72 @@ func TestDataDBReload(t *testing.T) { shdChan.CloseOnce() time.Sleep(10 * time.Millisecond) } +func TestDataDBReload2(t *testing.T) { + cfg := config.NewDefaultCGRConfig() + + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger.SetLogLevel(7) + + shdChan := utils.NewSyncedChan() + shdWg := new(sync.WaitGroup) + chS := engine.NewCacheS(cfg, nil, nil) + filterSChan := make(chan *engine.FilterS, 1) + filterSChan <- nil + close(chS.GetPrecacheChannel(utils.CacheAttributeProfiles)) + close(chS.GetPrecacheChannel(utils.CacheAttributeFilterIndexes)) + server := cores.NewServer(nil) + srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} + srvMngr := servmanager.NewServiceManager(cfg, shdChan, shdWg) + cM := engine.NewConnManager(cfg, nil) + db := NewDataDBService(cfg, cM, srvDep) + anz := NewAnalyzerService(cfg, server, filterSChan, shdChan, make(chan rpcclient.ClientConnector, 1), srvDep) + srvMngr.AddServices(NewAttributeService(cfg, db, + chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1), anz, srvDep), + NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz, srvDep), db) + if err := srvMngr.StartServices(); err != nil { + t.Error(err) + } + if db.IsRunning() { + t.Errorf("Expected service to be down") + } + var reply string + cfg.AttributeSCfg().Enabled = true + if err := cfg.V1ReloadConfig(&config.ReloadArgs{ + Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo"), + Section: config.DATADB_JSN, + }, &reply); err != nil { + t.Error(err) + } else if reply != utils.OK { + t.Errorf("Expecting OK ,received %s", reply) + } + time.Sleep(10 * time.Millisecond) //need to switch to gorutine + if !db.IsRunning() { + t.Errorf("Expected service to be running") + } + + err := db.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", "tutmysql"), + Section: config.DATADB_JSN, + }, &reply); err != nil { + t.Error(err) + } else if reply != utils.OK { + t.Errorf("Expecting OK ,received %s", reply) + } + + 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) + if db.IsRunning() { + t.Errorf("Expected service to be down") + } + shdChan.CloseOnce() + time.Sleep(10 * time.Millisecond) +}