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

Fixed tests in services

Browse Source
This commit is contained in:
andronache
2021-02-09 17:05:09 +02:00
committed by Dan Christian Bogos
parent f458e975d1
commit a58c9038d8
2 changed files with 54 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
services/loaders_it_test.go
View File

@@ -20,6 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
package services
import (
"io/ioutil"
"os"
"path"
"sync"
"testing"
@@ -33,7 +35,33 @@ import (
"github.com/cgrates/rpcclient"
)
func testCreateDirs(t *testing.T) {
for _, dir := range []string{"/tmp/In", "/tmp/Out", "/tmp/LoaderIn", "/tmp/SubpathWithoutMove",
"/tmp/SubpathLoaderWithMove", "/tmp/SubpathOut", "/tmp/templateLoaderIn", "/tmp/templateLoaderOut",
"/tmp/customSepLoaderIn", "/tmp/customSepLoaderOut"} {
if err := os.RemoveAll(dir); err != nil {
t.Fatal("Error removing folder: ", dir, err)
}
if err := os.MkdirAll(dir, 0755); err != nil {
t.Fatal("Error creating folder: ", dir, err)
}
}
if err := ioutil.WriteFile(path.Join("/tmp/In", utils.AttributesCsv), []byte(engine.AttributesCSVContent), 0644); err != nil {
t.Fatal(err.Error())
}
}
func testCleanupFiles(t *testing.T) {
for _, dir := range []string{"/tmp/In", "/tmp/Out", "/tmp/LoaderIn", "/tmp/SubpathWithoutMove",
"/tmp/SubpathLoaderWithMove", "/tmp/SubpathOut"} {
if err := os.RemoveAll(dir); err != nil {
t.Fatal("Error removing folder: ", dir, err)
}
}
}
func TestLoaderSReload(t *testing.T) {
testCreateDirs(t)
cfg := config.NewDefaultCGRConfig()
cfg.TemplatesCfg()["attrTemplateLoader"] = []*config.FCTemplate{
{
@@ -112,5 +140,5 @@ func TestLoaderSReload(t *testing.T) {
shdChan.CloseOnce()
time.Sleep(10 * time.Millisecond)
testCleanupFiles(t)
}

58
services/stordb_it_test.go
View File

@@ -83,20 +83,7 @@ func TestStorDBReload(t *testing.T) {
} else if reply != utils.OK {
t.Errorf("Expecting OK ,received %s", reply)
}
time.Sleep(10 * time.Millisecond)
err := stordb.Reload()
if err != nil {
t.Errorf("\nExpecting <nil>,\n Received <%+v>", err)
}
time.Sleep(10 * time.Millisecond)
if err := cfg.V1ReloadConfig(&config.ReloadArgs{
Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo"),
Section: config.STORDB_JSN,
}, &reply); err != nil {
t.Error(err)
} else if reply != utils.OK {
t.Errorf("Expecting OK ,received %s", reply)
}
select {
case d := <-cdrsRPC:
cdrsRPC <- d
@@ -109,37 +96,44 @@ func TestStorDBReload(t *testing.T) {
if !stordb.IsRunning() {
t.Errorf("Expected service to be running")
}
time.Sleep(10 * time.Millisecond)
if err := stordb.Reload(); err != nil {
t.Fatalf("\nExpecting <nil>,\n Received <%+v>", err)
}
time.Sleep(10 * time.Millisecond)
cfg.StorDbCfg().Password = ""
if err := cfg.V1ReloadConfig(&config.ReloadArgs{
Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo"),
Section: config.STORDB_JSN,
}, &reply); err != nil {
t.Error(err)
} else if reply != utils.OK {
t.Errorf("Expecting OK ,received %s", reply)
}
err = cdrS.Reload()
if err != nil {
if err := cdrS.Reload(); err != nil {
t.Errorf("\nExpecting <nil>,\n Received <%+v>", err)
}
err = stordb.Reload()
if err != nil {
t.Errorf("\nExpecting <nil>,\n Received <%+v>", err)
if err := stordb.Reload(); err != nil {
t.Fatalf("\nExpecting <nil>,\n Received <%+v>", err)
}
cfg.StorDbCfg().Type = utils.INTERNAL
err = stordb.Reload()
if err != nil {
if err := stordb.Reload(); err != nil {
t.Errorf("\nExpecting <nil>,\n Received <%+v>", err)
}
err = stordb.Reload()
if err != nil {
if err := stordb.Reload(); err != nil {
t.Errorf("\nExpecting <nil>,\n Received <%+v>", err)
}
err = db.Start()
if err == nil || err != utils.ErrServiceAlreadyRunning {
if err := db.Start(); err == nil || err != utils.ErrServiceAlreadyRunning {
t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err)
}
err = cdrS.Start()
if err == nil || err != utils.ErrServiceAlreadyRunning {
if err := cdrS.Start(); err == nil || err != utils.ErrServiceAlreadyRunning {
t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err)
}
err = cdrS.Reload()
if err != nil {
if err := cdrS.Reload(); err != nil {
t.Errorf("\nExpecting <nil>,\n Received <%+v>", err)
}
@@ -231,12 +225,10 @@ func TestStorDBReload2(t *testing.T) {
t.Errorf("\nExpecting <nil>,\n Received <%+v>", err)
}
err = cdrS.Start()
if err == nil || err != utils.ErrServiceAlreadyRunning {
if err := cdrS.Start(); err == nil || err != utils.ErrServiceAlreadyRunning {
t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err)
}
err = cdrS.Reload()
if err != nil {
if err := cdrS.Reload(); err != nil {
t.Errorf("\nExpecting <nil>,\n Received <%+v>", err)
}
cfg.CdrsCfg().Enabled = false