From bfd89f2d185d922791c6750db54d8ce6b973ca97 Mon Sep 17 00:00:00 2001 From: andronache Date: Wed, 16 Dec 2020 14:14:47 +0200 Subject: [PATCH] Continuing tests in services --- services/diameteragent_it_test.go | 8 ++++++++ services/dispatchers_it_test.go | 8 ++++++++ services/dnsagent_it_test.go | 8 ++++++++ services/ees_it_test.go | 8 ++++++++ services/ers_it_test.go | 8 ++++++++ services/kamailioagent_it_test.go | 1 + services/radiusagent_it_test.go | 8 ++++++++ services/rals_it_test.go | 9 ++++++++- services/rates_it_test.go | 8 ++++++++ services/resources_it_test.go | 8 ++++++++ services/routes_it_test.go | 8 ++++++++ 11 files changed, 81 insertions(+), 1 deletion(-) diff --git a/services/diameteragent_it_test.go b/services/diameteragent_it_test.go index e899814c4..dc6b22fa3 100644 --- a/services/diameteragent_it_test.go +++ b/services/diameteragent_it_test.go @@ -78,6 +78,14 @@ func TestDiameterAgentReload(t *testing.T) { if !srv.IsRunning() { t.Errorf("Expected service to be running") } + err := srv.Start() + if err == nil || err != utils.ErrServiceAlreadyRunning { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err) + } + err = srv.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } cfg.DiameterAgentCfg().Enabled = false cfg.GetReloadChan(config.DA_JSN) <- struct{}{} time.Sleep(10 * time.Millisecond) diff --git a/services/dispatchers_it_test.go b/services/dispatchers_it_test.go index db60bee32..a5e8f435f 100644 --- a/services/dispatchers_it_test.go +++ b/services/dispatchers_it_test.go @@ -88,6 +88,14 @@ func TestDispatcherSReload(t *testing.T) { if !db.IsRunning() { t.Errorf("Expected service to be running") } + err := srv.Start() + if err == nil || err != utils.ErrServiceAlreadyRunning { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err) + } + err = srv.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } cfg.DispatcherSCfg().Enabled = false cfg.GetReloadChan(config.DispatcherSJson) <- struct{}{} time.Sleep(10 * time.Millisecond) diff --git a/services/dnsagent_it_test.go b/services/dnsagent_it_test.go index 3bf33615b..937f14d7c 100644 --- a/services/dnsagent_it_test.go +++ b/services/dnsagent_it_test.go @@ -78,6 +78,14 @@ func TestDNSAgentReload(t *testing.T) { if !srv.IsRunning() { t.Errorf("Expected service to be running") } + err := srv.Start() + if err == nil || err != utils.ErrServiceAlreadyRunning { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err) + } + err = srv.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } cfg.DNSAgentCfg().Enabled = false cfg.GetReloadChan(config.DNSAgentJson) <- struct{}{} time.Sleep(10 * time.Millisecond) diff --git a/services/ees_it_test.go b/services/ees_it_test.go index 559e76108..3c24457cc 100644 --- a/services/ees_it_test.go +++ b/services/ees_it_test.go @@ -96,6 +96,14 @@ func TestEventExporterSReload(t *testing.T) { if !ees.IsRunning() { t.Errorf("Expected service to be running") } + err := ees.Start() + if err == nil || err != utils.ErrServiceAlreadyRunning { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err) + } + err = ees.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } cfg.EEsCfg().Enabled = false cfg.GetReloadChan(config.EEsJson) <- struct{}{} time.Sleep(10 * time.Millisecond) diff --git a/services/ers_it_test.go b/services/ers_it_test.go index ac798a6ea..eba2eebbd 100644 --- a/services/ers_it_test.go +++ b/services/ers_it_test.go @@ -82,6 +82,14 @@ func TestEventReaderSReload(t *testing.T) { if !attrS.IsRunning() { t.Errorf("Expected service to be running") } + err := attrS.Start() + if err == nil || err != utils.ErrServiceAlreadyRunning { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err) + } + err = attrS.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } cfg.ERsCfg().Enabled = false cfg.GetReloadChan(config.ERsJson) <- struct{}{} time.Sleep(10 * time.Millisecond) diff --git a/services/kamailioagent_it_test.go b/services/kamailioagent_it_test.go index 0666827ee..24a84cc0d 100644 --- a/services/kamailioagent_it_test.go +++ b/services/kamailioagent_it_test.go @@ -76,6 +76,7 @@ func TestKamailioAgentReload(t *testing.T) { } else if reply != utils.OK { t.Errorf("Expecting OK ,received %s", reply) } + runtime.Gosched() time.Sleep(10 * time.Millisecond) //need to switch to gorutine // the engine should be stoped as we could not connect to kamailio diff --git a/services/radiusagent_it_test.go b/services/radiusagent_it_test.go index 785c7493d..319d06e5a 100644 --- a/services/radiusagent_it_test.go +++ b/services/radiusagent_it_test.go @@ -78,6 +78,14 @@ func TestRadiusAgentReload(t *testing.T) { if !srv.IsRunning() { t.Errorf("Expected service to be running") } + err := srv.Start() + if err == nil || err != utils.ErrServiceAlreadyRunning { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err) + } + err = srv.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } cfg.RadiusAgentCfg().Enabled = false cfg.GetReloadChan(config.RA_JSN) <- struct{}{} time.Sleep(10 * time.Millisecond) diff --git a/services/rals_it_test.go b/services/rals_it_test.go index 92ec686c6..b443e5107 100644 --- a/services/rals_it_test.go +++ b/services/rals_it_test.go @@ -110,13 +110,20 @@ func TestRalsReload(t *testing.T) { if !stordb.IsRunning() { t.Errorf("Expected service to be running") } + err := ralS.Start() + if err == nil || err != utils.ErrServiceAlreadyRunning { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err) + } + err = ralS.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } cfg.RalsCfg().Enabled = false cfg.GetReloadChan(config.RALS_JSN) <- struct{}{} time.Sleep(10 * time.Millisecond) if ralS.IsRunning() { t.Errorf("Expected service to be down") } - if resp := ralS.GetResponder(); resp.IsRunning() { t.Errorf("Expected service to be down") } diff --git a/services/rates_it_test.go b/services/rates_it_test.go index 666a7ce1d..e2a5c2d8e 100644 --- a/services/rates_it_test.go +++ b/services/rates_it_test.go @@ -74,6 +74,14 @@ func TestRateSReload(t *testing.T) { if !rS.IsRunning() { t.Errorf("Expected service to be running") } + err := rS.Start() + if err == nil || err != utils.ErrServiceAlreadyRunning { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err) + } + err = rS.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } cfg.RateSCfg().Enabled = false cfg.GetReloadChan(config.RateSJson) <- struct{}{} time.Sleep(10 * time.Millisecond) diff --git a/services/resources_it_test.go b/services/resources_it_test.go index 4a2acb812..64d5028a1 100644 --- a/services/resources_it_test.go +++ b/services/resources_it_test.go @@ -87,6 +87,14 @@ func TestResourceSReload(t *testing.T) { if !db.IsRunning() { t.Errorf("Expected service to be running") } + err := reS.Start() + if err == nil || err != utils.ErrServiceAlreadyRunning { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err) + } + err = reS.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } cfg.ResourceSCfg().Enabled = false cfg.GetReloadChan(config.RESOURCES_JSON) <- struct{}{} time.Sleep(10 * time.Millisecond) diff --git a/services/routes_it_test.go b/services/routes_it_test.go index c26ee79a4..249f9b928 100644 --- a/services/routes_it_test.go +++ b/services/routes_it_test.go @@ -85,6 +85,14 @@ func TestSupplierSReload(t *testing.T) { if !db.IsRunning() { t.Errorf("Expected service to be running") } + err := supS.Start() + if err == nil || err != utils.ErrServiceAlreadyRunning { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err) + } + err = supS.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } cfg.RouteSCfg().Enabled = false cfg.GetReloadChan(config.RouteSJson) <- struct{}{} time.Sleep(10 * time.Millisecond)