uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Tests in services

Browse Source
This commit is contained in:
root
2021-02-18 15:44:45 +02:00
committed by Dan Christian Bogos
parent 162319d24b
commit 0f06052630
10 changed files with 109 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agents/dnsagent.go
View File

@@ -51,13 +51,11 @@ func (da *DNSAgent) initDNSServer() (err error) {
handler := dns.HandlerFunc(func(w dns.ResponseWriter, m *dns.Msg) {
go da.handleMessage(w, m)
})
if strings.HasSuffix(da.cgrCfg.DNSAgentCfg().ListenNet, utils.TLSNoCaps) {
cert, err := tls.LoadX509KeyPair(da.cgrCfg.TLSCfg().ServerCerificate, da.cgrCfg.TLSCfg().ServerKey)
if err != nil {
return err
}
config := tls.Config{
Certificates: []tls.Certificate{cert},
}

2
services/dnsagent.go
View File

@@ -61,7 +61,6 @@ func (dns *DNSAgent) Start() (err error) {
if dns.IsRunning() {
return utils.ErrServiceAlreadyRunning
}
filterS := <-dns.filterSChan
dns.filterSChan <- filterS
@@ -71,6 +70,7 @@ func (dns *DNSAgent) Start() (err error) {
dns.dns, err = agents.NewDNSAgent(dns.cfg, filterS, dns.connMgr)
if err != nil {
utils.Logger.Err(fmt.Sprintf("<%s> error: <%s>", utils.DNSAgent, err.Error()))
dns.dns = nil
return
}
go func() {

83
services/dnsagent_it_test.go
View File

@@ -187,10 +187,67 @@ func TestDNSAgentReload2(t *testing.T) {
time.Sleep(10 * time.Millisecond)
}
/*
func TestDNSAgentReload3(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.SessionSCfg().Enabled = true
cfg.DNSAgentCfg().ListenNet = "testtls"
cfg.TLSCfg().ServerCerificate = ""
cfg.TLSCfg().ServerKey = ""
utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID)
utils.Logger.SetLogLevel(7)
filterSChan := make(chan *engine.FilterS, 1)
filterSChan <- nil
shdChan := utils.NewSyncedChan()
shdWg := new(sync.WaitGroup)
chS := engine.NewCacheS(cfg, nil, nil)
cacheSChan := make(chan rpcclient.ClientConnector, 1)
cacheSChan <- chS
server := cores.NewServer(nil)
srvMngr := servmanager.NewServiceManager(cfg, shdChan, shdWg)
srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)}
db := NewDataDBService(cfg, nil, srvDep)
anz := NewAnalyzerService(cfg, server, filterSChan, shdChan, make(chan rpcclient.ClientConnector, 1), srvDep)
sS := NewSessionService(cfg, db, server, make(chan rpcclient.ClientConnector, 1),
shdChan, nil, nil, anz, srvDep)
srv := NewDNSAgent(cfg, filterSChan, shdChan, nil, srvDep)
engine.NewConnManager(cfg, nil)
srvMngr.AddServices(srv, sS,
NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz, srvDep), db)
if err := srvMngr.StartServices(); err != nil {
t.Fatal(err)
}
if srv.IsRunning() {
t.Errorf("Expected service to be down")
}
var reply string
if err := cfg.V1ReloadConfig(&config.ReloadArgs{
Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "dnsagent_mongo"),
Section: config.DNSAgentJson,
}, &reply); err != nil {
t.Fatal(err)
} else if reply != utils.OK {
t.Errorf("Expecting OK ,received %s", reply)
}
time.Sleep(10 * time.Millisecond)
cfg.DNSAgentCfg().Enabled = false
cfg.GetReloadChan(config.DNSAgentJson) <- struct{}{}
time.Sleep(10 * time.Millisecond)
if srv.IsRunning() {
t.Errorf("Expected service to be down")
}
shdChan.CloseOnce()
time.Sleep(10 * time.Millisecond)
}
func TestDNSAgentReload4(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.SessionSCfg().Enabled = true
utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID)
utils.Logger.SetLogLevel(7)
filterSChan := make(chan *engine.FilterS, 1)
@@ -229,15 +286,24 @@ func TestDNSAgentReload3(t *testing.T) {
t.Errorf("Expecting OK ,received %s", reply)
}
time.Sleep(10 * time.Millisecond) //need to switch to gorutine
runtime.Gosched()
runtime.Gosched()
runtime.Gosched()
runtime.Gosched()
if !srv.IsRunning() {
t.Errorf("Expected service to be running")
}
runtime.Gosched()
runtime.Gosched()
runtime.Gosched()
runtime.Gosched()
err := srv.Start()
if err == nil || err != utils.ErrServiceAlreadyRunning {
t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err)
}
runtime.Gosched()
runtime.Gosched()
err = srv.Reload()
if err != nil {
t.Errorf("\nExpecting <nil>,\n Received <%+v>", err)
@@ -246,12 +312,21 @@ func TestDNSAgentReload3(t *testing.T) {
if err != nil {
t.Errorf("\nExpecting <nil>,\n Received <%+v>", err)
}
runtime.Gosched()
runtime.Gosched()
err = srv.Reload()
if err != nil {
t.Errorf("\nExpecting <nil>,\n Received <%+v>", err)
}
time.Sleep(10 * time.Millisecond)
cfg.DNSAgentCfg().Enabled = false
cfg.GetReloadChan(config.DNSAgentJson) <- struct{}{}
time.Sleep(10 * time.Millisecond)
runtime.Gosched()
runtime.Gosched()
if srv.IsRunning() {
t.Errorf("Expected service to be down")
}
shdChan.CloseOnce()
time.Sleep(10 * time.Millisecond)
}
*/

5
services/ers_it_test.go
View File

@@ -79,16 +79,17 @@ func TestEventReaderSReload(t *testing.T) {
t.Errorf("Expecting OK ,received %s", reply)
}
runtime.Gosched()
runtime.Gosched()
time.Sleep(10 * time.Millisecond) //need to switch to gorutine
if !attrS.IsRunning() {
t.Errorf("Expected service to be running")
}
runtime.Gosched()
err := attrS.Start()
if err == nil || err != utils.ErrServiceAlreadyRunning {
t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err)
}
time.Sleep(10 * time.Millisecond)
runtime.Gosched()
err = attrS.Reload()
if err != nil {
t.Errorf("\nExpecting <nil>,\n Received <%+v>", err)

1
services/freeswitchagent_it_test.go
View File

@@ -87,6 +87,7 @@ func TestFreeSwitchAgentReload(t *testing.T) {
}
srv.(*FreeswitchAgent).fS = agents.NewFSsessions(agentCfg, "", nil)
runtime.Gosched()
err := srv.Reload()
if err != nil {
t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, err)

4
services/httpagent_it_test.go
View File

@@ -21,6 +21,7 @@ package services
import (
"path"
"runtime"
"sync"
"testing"
"time"
@@ -72,13 +73,16 @@ func TestHTTPAgentReload(t *testing.T) {
t.Errorf("Expecting OK ,received %s", reply)
}
time.Sleep(10 * time.Millisecond) //need to switch to gorutine
runtime.Gosched()
if !srv.IsRunning() {
t.Errorf("Expected service to be running")
}
runtime.Gosched()
srvReload := srv.Reload()
if srvReload != nil {
t.Errorf("\nExpecting <nil>,\n Received <%+v>", srvReload)
}
runtime.Gosched()
err := srv.Start()
if err != utils.ErrServiceAlreadyRunning {
t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err)

6
services/radiusagent_it_test.go
View File

@@ -21,6 +21,7 @@ package services
import (
"path"
"runtime"
"sync"
"testing"
"time"
@@ -139,10 +140,13 @@ func TestRadiusAgentReload2(t *testing.T) {
t.Errorf("Expecting OK ,received %s", reply)
}
time.Sleep(10 * time.Millisecond) //need to switch to gorutine
runtime.Gosched()
runtime.Gosched()
if !srv.IsRunning() {
t.Errorf("Expected service to be running")
}
runtime.Gosched()
runtime.Gosched()
err := srv.Start()
if err == nil || err != utils.ErrServiceAlreadyRunning {
t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err)

3
services/sessions_it_test.go
View File

@@ -83,7 +83,8 @@ func TestSessionSReload(t *testing.T) {
if stordb.IsRunning() {
t.Errorf("Expected service to be down")
}
/*
var reply string
if err := cfg.V1ReloadConfig(&config.ReloadArgs{
Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongonew"),

11
services/sipagent_it_test.go
View File

@@ -21,6 +21,7 @@ package services
import (
"path"
"runtime"
"sync"
"testing"
"time"
@@ -75,9 +76,17 @@ func TestSIPAgentReload(t *testing.T) {
t.Errorf("Expecting OK ,received %s", reply)
}
time.Sleep(10 * time.Millisecond) //need to switch to gorutine
runtime.Gosched()
runtime.Gosched()
runtime.Gosched()
runtime.Gosched()
if !srv.IsRunning() {
t.Errorf("Expected service to be running")
}
runtime.Gosched()
runtime.Gosched()
runtime.Gosched()
runtime.Gosched()
srvStart := srv.Start()
if srvStart != utils.ErrServiceAlreadyRunning {
t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, srvStart)
@@ -91,7 +100,7 @@ func TestSIPAgentReload(t *testing.T) {
t.Fatalf("cannot cast")
}
castSrv.oldListen = "test_string"
runtime.Gosched()
err = srv.Reload()
if err != nil {
t.Errorf("\nExpecting <err>,\n Received <%+v>", err)

4
services/thresholds_it_test.go
View File

@@ -21,6 +21,7 @@ package services
import (
"path"
"runtime"
"sync"
"testing"
"time"
@@ -75,12 +76,15 @@ func TestThresholdSReload(t *testing.T) {
t.Errorf("Expecting OK ,received %s", reply)
}
time.Sleep(10 * time.Millisecond) //need to switch to gorutine
runtime.Gosched()
if !tS.IsRunning() {
t.Errorf("Expected service to be running")
}
runtime.Gosched()
if !db.IsRunning() {
t.Errorf("Expected service to be running")
}
runtime.Gosched()
err := tS.Start()
if err == nil || err != utils.ErrServiceAlreadyRunning {
t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err)