From d39c48377ff9e90c0515607796578bc29d705143 Mon Sep 17 00:00:00 2001 From: andronache Date: Thu, 17 Jun 2021 08:21:54 +0300 Subject: [PATCH] Fixed integration test in registrarc --- services/registrarc.go | 9 ++------- services/registrarc_it_test.go | 3 ++- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/services/registrarc.go b/services/registrarc.go index a1bf64371..de947831a 100644 --- a/services/registrarc.go +++ b/services/registrarc.go @@ -103,11 +103,6 @@ func (dspS *RegistrarCService) ServiceName() string { // ShouldRun returns if the service should be running func (dspS *RegistrarCService) ShouldRun() bool { - if len(dspS.cfg.RegistrarCCfg().RPC.RegistrarSConns) != 0 { - return true - } - if len(dspS.cfg.RegistrarCCfg().Dispatchers.RegistrarSConns) != 0 { - return true - } - return false + return len(dspS.cfg.RegistrarCCfg().RPC.RegistrarSConns) != 0 || + len(dspS.cfg.RegistrarCCfg().Dispatchers.RegistrarSConns) != 0 } diff --git a/services/registrarc_it_test.go b/services/registrarc_it_test.go index 90675ebbe..b577eefd1 100644 --- a/services/registrarc_it_test.go +++ b/services/registrarc_it_test.go @@ -89,9 +89,10 @@ func TestDispatcherHReload(t *testing.T) { if err != nil { t.Errorf("\nExpecting ,\n Received <%+v>", err) } + cfg.RegistrarCCfg().RPC.RegistrarSConns = nil + cfg.RegistrarCCfg().Dispatchers.RegistrarSConns = nil cfg.GetReloadChan(config.RegistrarCJson) <- struct{}{} time.Sleep(10 * time.Millisecond) - srv.Shutdown() if srv.IsRunning() { t.Errorf("Expected service to be down") }