diff --git a/services/freeswitchagent_it_test.go b/services/freeswitchagent_it_test.go index dbf3cb627..018fa0567 100644 --- a/services/freeswitchagent_it_test.go +++ b/services/freeswitchagent_it_test.go @@ -92,7 +92,6 @@ func TestFreeSwitchAgentReload(t *testing.T) { } srv.(*FreeswitchAgent).fS = agents.NewFSsessions(agentCfg, "", nil) - err := srv.Reload() if err != nil { t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, err) diff --git a/services/kamailioagent_it_test.go b/services/kamailioagent_it_test.go index 8fe3e2522..f9db1d6ce 100644 --- a/services/kamailioagent_it_test.go +++ b/services/kamailioagent_it_test.go @@ -66,6 +66,7 @@ func TestKamailioAgentReload(t *testing.T) { if err := srvMngr.StartServices(); err != nil { t.Fatal(err) } + if srv.IsRunning() { t.Errorf("Expected service to be down") } @@ -78,6 +79,9 @@ func TestKamailioAgentReload(t *testing.T) { } else if reply != utils.OK { t.Errorf("Expecting OK ,received %s", reply) } + + runtime.Gosched() + time.Sleep(10 * time.Millisecond) kaCfg := &config.KamAgentCfg{ Enabled: true, SessionSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaSessionS)}, @@ -88,13 +92,13 @@ func TestKamailioAgentReload(t *testing.T) { srv.(*KamailioAgent).kam = agents.NewKamailioAgent(kaCfg, nil, "") - srv.Reload() - runtime.Gosched() + err := srv.Reload() + if err != nil { + t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, err) + } time.Sleep(10 * time.Millisecond) //need to switch to gorutine // the engine should be stoped as we could not connect to kamailio - if srv.IsRunning() { - t.Errorf("Expected service to be down") - } + shdChan.CloseOnce() time.Sleep(10 * time.Millisecond) } diff --git a/services/sessions_it_test.go b/services/sessions_it_test.go index 9b10be355..67718e5fb 100644 --- a/services/sessions_it_test.go +++ b/services/sessions_it_test.go @@ -110,6 +110,7 @@ func TestSessionSReload(t *testing.T) { if !srv.IsRunning() { t.Errorf("Expected service to be running") } + time.Sleep(10 * time.Millisecond) if !db.IsRunning() { t.Errorf("Expected service to be running") } diff --git a/services/stordb_it_test.go b/services/stordb_it_test.go index de1afef11..b1d02c43d 100644 --- a/services/stordb_it_test.go +++ b/services/stordb_it_test.go @@ -122,7 +122,10 @@ func TestStorDBReload(t *testing.T) { if err := stordb.Reload(); err != nil { t.Errorf("\nExpecting ,\n Received <%+v>", err) } - + err := stordb.Start() + if err != utils.ErrServiceAlreadyRunning { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err) + } if err := stordb.Reload(); err != nil { t.Errorf("\nExpecting ,\n Received <%+v>", err) }