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

Centralize test flags in utils for shared use across tests

Browse Source
This commit is contained in:
ionutboangiu
2024-04-04 19:33:29 +03:00
committed by Dan Christian Bogos
parent 77b58257d3
commit 16eb745f00
268 changed files with 1262 additions and 1340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ers/ers_reload_it_test.go
View File

@@ -54,7 +54,7 @@ var (
)
func TestERsReload(t *testing.T) {
switch *dbType {
switch *utils.DBType {
case utils.MetaInternal:
ersReloadConfigDIR = "disabled_internal"
case utils.MetaMySQL:
@@ -74,7 +74,7 @@ func TestERsReload(t *testing.T) {
func testReloadITInitConfig(t *testing.T) {
var err error
reloadCfgPath = path.Join(*dataDir, "conf", "samples", "ers_reload", ersReloadConfigDIR)
reloadCfgPath = path.Join(*utils.DataDir, "conf", "samples", "ers_reload", ersReloadConfigDIR)
if reloadCfg, err = config.NewCGRConfigFromPath(reloadCfgPath); err != nil {
t.Fatal("Got config error: ", err.Error())
}
@@ -107,7 +107,7 @@ func testReloadITCreateCdrDirs(t *testing.T) {
}
func testReloadITStartEngine(t *testing.T) {
if _, err := engine.StopStartEngine(reloadCfgPath, *waitRater); err != nil {
if _, err := engine.StopStartEngine(reloadCfgPath, *utils.WaitRater); err != nil {
t.Fatal(err)
}
}
@@ -132,7 +132,7 @@ func testReloadVerifyDisabledReaders(t *testing.T) {
func testReloadReloadConfigFromPath(t *testing.T) {
var reply string
if err := reloadRPC.Call(context.Background(), utils.ConfigSv1ReloadConfig, &config.ReloadArgs{
Path: path.Join(*dataDir, "conf", "samples", "ers_reload", "first_reload"),
Path: path.Join(*utils.DataDir, "conf", "samples", "ers_reload", "first_reload"),
Section: config.ERsJson,
}, &reply); err != nil {
t.Error(err)
@@ -163,7 +163,7 @@ func testReloadVerifyFirstReload(t *testing.T) {
}
func testReloadITKillEngine(t *testing.T) {
if err := engine.KillEngine(*waitRater); err != nil {
if err := engine.KillEngine(*utils.WaitRater); err != nil {
t.Error(err)
}
}

10
ers/filecsv_it_test.go
View File

@@ -86,7 +86,7 @@ accid23;*rated;cgrates.org;1001;086517174963;2013-02-03 19:54:00;26;val_extra3;"
)
func TestCsvReadFile(t *testing.T) {
switch *dbType {
switch *utils.DBType {
case utils.MetaInternal:
csvCfgDIR = "ers_internal"
case utils.MetaMySQL:
@@ -106,7 +106,7 @@ func TestCsvReadFile(t *testing.T) {
func testCsvITInitConfig(t *testing.T) {
var err error
csvCfgPath = path.Join(*dataDir, "conf", "samples", csvCfgDIR)
csvCfgPath = path.Join(*utils.DataDir, "conf", "samples", csvCfgDIR)
if csvCfg, err = config.NewCGRConfigFromPath(csvCfgPath); err != nil {
t.Fatal("Got config error: ", err.Error())
}
@@ -127,7 +127,7 @@ func testCsvITResetDataDb(t *testing.T) {
}
func testCsvITStartEngine(t *testing.T) {
if _, err := engine.StopStartEngine(csvCfgPath, *waitRater); err != nil {
if _, err := engine.StopStartEngine(csvCfgPath, *utils.WaitRater); err != nil {
t.Fatal(err)
}
}
@@ -143,7 +143,7 @@ func testCsvITRpcConn(t *testing.T) {
func testCsvITLoadTPFromFolder(t *testing.T) {
attrs := &utils.AttrLoadTpFromFolder{
FolderPath: path.Join(*dataDir, "tariffplans", "testit")}
FolderPath: path.Join(*utils.DataDir, "tariffplans", "testit")}
var loadInst utils.LoadInstance
if err := csvRPC.Call(context.Background(), utils.APIerSv2LoadTariffPlanFromFolder,
attrs, &loadInst); err != nil {
@@ -371,7 +371,7 @@ func testCsvITAnalyzeReaderWithFilter(t *testing.T) {
}
func testCsvITKillEngine(t *testing.T) {
if err := engine.KillEngine(*waitRater); err != nil {
if err := engine.KillEngine(*utils.WaitRater); err != nil {
t.Error(err)
}
}

8
ers/filefwv_it_test.go
View File

@@ -59,7 +59,7 @@ var (
)
func TestFWVReadFile(t *testing.T) {
switch *dbType {
switch *utils.DBType {
case utils.MetaInternal:
fwvCfgDIR = "ers_internal"
case utils.MetaMySQL:
@@ -79,7 +79,7 @@ func TestFWVReadFile(t *testing.T) {
func testFWVITInitConfig(t *testing.T) {
var err error
fwvCfgPath = path.Join(*dataDir, "conf", "samples", fwvCfgDIR)
fwvCfgPath = path.Join(*utils.DataDir, "conf", "samples", fwvCfgDIR)
if fwvCfg, err = config.NewCGRConfigFromPath(fwvCfgPath); err != nil {
t.Fatal("Got config error: ", err.Error())
}
@@ -100,7 +100,7 @@ func testFWVITResetDataDb(t *testing.T) {
}
func testFWVITStartEngine(t *testing.T) {
if _, err := engine.StopStartEngine(fwvCfgPath, *waitRater); err != nil {
if _, err := engine.StopStartEngine(fwvCfgPath, *utils.WaitRater); err != nil {
t.Fatal(err)
}
}
@@ -201,7 +201,7 @@ func testFWVITAnalyseCDRs(t *testing.T) {
}
func testFWVITKillEngine(t *testing.T) {
if err := engine.KillEngine(*waitRater); err != nil {
if err := engine.KillEngine(*utils.WaitRater); err != nil {
t.Error(err)
}
}

8
ers/filejson_it_test.go
View File

@@ -75,7 +75,7 @@ var (
)
func TestJSONReadFile(t *testing.T) {
switch *dbType {
switch *utils.DBType {
case utils.MetaInternal:
jsonCfgDIR = "ers_internal"
case utils.MetaMySQL:
@@ -95,7 +95,7 @@ func TestJSONReadFile(t *testing.T) {
func testJSONInitConfig(t *testing.T) {
var err error
jsonCfgPath = path.Join(*dataDir, "conf", "samples", jsonCfgDIR)
jsonCfgPath = path.Join(*utils.DataDir, "conf", "samples", jsonCfgDIR)
if jsonCfg, err = config.NewCGRConfigFromPath(jsonCfgPath); err != nil {
t.Fatal("Got config error: ", err.Error())
}
@@ -116,7 +116,7 @@ func testJSONResetDataDb(t *testing.T) {
}
func testJSONStartEngine(t *testing.T) {
if _, err := engine.StopStartEngine(jsonCfgPath, *waitRater); err != nil {
if _, err := engine.StopStartEngine(jsonCfgPath, *utils.WaitRater); err != nil {
t.Fatal(err)
}
}
@@ -225,7 +225,7 @@ func testJSONVerify(t *testing.T) {
}
func testJSONKillEngine(t *testing.T) {
if err := engine.KillEngine(*waitRater); err != nil {
if err := engine.KillEngine(*utils.WaitRater); err != nil {
t.Error(err)
}
}

10
ers/filexml_it_test.go
View File

@@ -61,7 +61,7 @@ var (
)
func TestXMLReadFile(t *testing.T) {
switch *dbType {
switch *utils.DBType {
case utils.MetaInternal:
xmlCfgDIR = "ers_internal"
case utils.MetaMySQL:
@@ -80,7 +80,7 @@ func TestXMLReadFile(t *testing.T) {
func testXMLITInitConfig(t *testing.T) {
var err error
xmlCfgPath = path.Join(*dataDir, "conf", "samples", xmlCfgDIR)
xmlCfgPath = path.Join(*utils.DataDir, "conf", "samples", xmlCfgDIR)
if xmlCfg, err = config.NewCGRConfigFromPath(xmlCfgPath); err != nil {
t.Fatal("Got config error: ", err.Error())
}
@@ -101,7 +101,7 @@ func testXMLITResetDataDb(t *testing.T) {
}
func testXMLITStartEngine(t *testing.T) {
if _, err := engine.StopStartEngine(xmlCfgPath, *waitRater); err != nil {
if _, err := engine.StopStartEngine(xmlCfgPath, *utils.WaitRater); err != nil {
t.Fatal(err)
}
}
@@ -117,7 +117,7 @@ func testXMLITRpcConn(t *testing.T) {
func testXMLITLoadTPFromFolder(t *testing.T) {
attrs := &utils.AttrLoadTpFromFolder{
FolderPath: path.Join(*dataDir, "tariffplans", "testit")}
FolderPath: path.Join(*utils.DataDir, "tariffplans", "testit")}
var loadInst utils.LoadInstance
if err := xmlRPC.Call(context.Background(), utils.APIerSv2LoadTariffPlanFromFolder,
attrs, &loadInst); err != nil {
@@ -335,7 +335,7 @@ func testXMLITEmptyRootPathCaseCheckCDRs(t *testing.T) {
}
func testXMLITKillEngine(t *testing.T) {
if err := engine.KillEngine(*waitRater); err != nil {
if err := engine.KillEngine(*utils.WaitRater); err != nil {
t.Error(err)
}
}

8
ers/flatstore_it_test.go
View File

@@ -102,7 +102,7 @@ BYE|3111f3c9|49ca4c42|a58ebaae40d08d6757d8424fb09c4c54@0:0:0:0:0:0:0:0|200|OK|14
)
func TestFlatstoreFile(t *testing.T) {
switch *dbType {
switch *utils.DBType {
case utils.MetaInternal:
flatstoreCfgDIR = "ers_internal"
case utils.MetaMySQL:
@@ -121,7 +121,7 @@ func TestFlatstoreFile(t *testing.T) {
func testFlatstoreITInitConfig(t *testing.T) {
var err error
flatstoreCfgPath = path.Join(*dataDir, "conf", "samples", flatstoreCfgDIR)
flatstoreCfgPath = path.Join(*utils.DataDir, "conf", "samples", flatstoreCfgDIR)
if flatstoreCfg, err = config.NewCGRConfigFromPath(flatstoreCfgPath); err != nil {
t.Fatal("Got config error: ", err.Error())
}
@@ -142,7 +142,7 @@ func testFlatstoreITResetDataDb(t *testing.T) {
}
func testFlatstoreITStartEngine(t *testing.T) {
if _, err := engine.StopStartEngine(flatstoreCfgPath, *waitRater); err != nil {
if _, err := engine.StopStartEngine(flatstoreCfgPath, *utils.WaitRater); err != nil {
t.Fatal(err)
}
}
@@ -327,7 +327,7 @@ func testFlatstoreITAnalyseCDRs3(t *testing.T) {
}
func testFlatstoreITKillEngine(t *testing.T) {
if err := engine.KillEngine(*waitRater); err != nil {
if err := engine.KillEngine(*utils.WaitRater); err != nil {
t.Error(err)
}
}

10
ers/lib_test.go
View File

@@ -20,7 +20,6 @@ package ers
import (
"errors"
"flag"
"os"
"testing"
@@ -30,15 +29,8 @@ import (
"github.com/cgrates/cgrates/utils"
)
var (
dataDir = flag.String("data_dir", "/usr/share/cgrates", "CGR data dir path here")
waitRater = flag.Int("wait_rater", 100, "Number of miliseconds to wait for rater to start and cache")
encoding = flag.String("rpc", utils.MetaJSON, "what encoding whould be uused for rpc comunication")
dbType = flag.String("dbtype", utils.MetaInternal, "The type of DataBase (Internal/Mongo/mySql)")
)
func newRPCClient(cfg *config.ListenCfg) (c *birpc.Client, err error) {
switch *encoding {
switch *utils.Encoding {
case utils.MetaJSON:
return jsonrpc.Dial(utils.TCP, cfg.RPCJSONListen)
case utils.MetaGOB:

16
ers/nats_it_test.go
View File

@@ -40,7 +40,7 @@ import (
)
func TestNatsConcurrentReaders(t *testing.T) {
switch *dbType {
switch *utils.DBType {
case utils.MetaInternal:
case utils.MetaMySQL, utils.MetaMongo, utils.MetaPostgres:
t.SkipNow()
@@ -48,7 +48,7 @@ func TestNatsConcurrentReaders(t *testing.T) {
t.Fatal("unsupported dbtype value")
}
cfgPath := path.Join(*dataDir, "conf", "samples", "ers_nats")
cfgPath := path.Join(*utils.DataDir, "conf", "samples", "ers_nats")
cfg, err := config.NewCGRConfigFromPath(cfgPath)
if err != nil {
t.Fatal("could not init cfg", err.Error())
@@ -181,7 +181,7 @@ var natsCfg string = `{
}`
func TestNatsNormalTT(t *testing.T) {
switch *dbType {
switch *utils.DBType {
case utils.MetaInternal:
case utils.MetaMySQL, utils.MetaMongo, utils.MetaPostgres:
t.SkipNow()
@@ -315,12 +315,12 @@ resolver_preload: {
t.Fatal(err)
}
if _, err = engine.StartEngine(cfgPath, *waitRater); err != nil {
if _, err = engine.StartEngine(cfgPath, *utils.WaitRater); err != nil {
t.Fatal(err)
}
t.Cleanup(func() {
engine.KillEngine(*waitRater)
engine.KillEngine(*utils.WaitRater)
nc.Close()
})
@@ -356,7 +356,7 @@ resolver_preload: {
}
func TestNatsJetStreamTT(t *testing.T) {
switch *dbType {
switch *utils.DBType {
case utils.MetaInternal:
case utils.MetaMySQL, utils.MetaMongo, utils.MetaPostgres:
t.SkipNow()
@@ -516,10 +516,10 @@ system_account:AAFIBB6C56ROU5XRVJLJYR3BTGGYK3HJGHEHQV7L7QZMTT3ZRBLHBS7F
}
defer js.DeleteStream(context.Background(), "stream")
if _, err = engine.StartEngine(cfgPath, *waitRater); err != nil {
if _, err = engine.StartEngine(cfgPath, *utils.WaitRater); err != nil {
t.Fatal(err)
}
defer engine.KillEngine(*waitRater)
defer engine.KillEngine(*utils.WaitRater)
client, err := newRPCClient(cfg.ListenCfg())
if err != nil {

8
ers/partial_csv_it_test.go
View File

@@ -71,7 +71,7 @@ var (
)
func TestPartReadFile(t *testing.T) {
switch *dbType {
switch *utils.DBType {
case utils.MetaInternal:
partCfgDIR = "ers_internal"
case utils.MetaMySQL:
@@ -90,7 +90,7 @@ func TestPartReadFile(t *testing.T) {
func testPartITInitConfig(t *testing.T) {
var err error
partCfgPath = path.Join(*dataDir, "conf", "samples", partCfgDIR)
partCfgPath = path.Join(*utils.DataDir, "conf", "samples", partCfgDIR)
if partCfg, err = config.NewCGRConfigFromPath(partCfgPath); err != nil {
t.Fatal("Got config error: ", err.Error())
}
@@ -111,7 +111,7 @@ func testPartITResetDataDb(t *testing.T) {
}
func testPartITStartEngine(t *testing.T) {
if _, err := engine.StopStartEngine(partCfgPath, *waitRater); err != nil {
if _, err := engine.StopStartEngine(partCfgPath, *utils.WaitRater); err != nil {
t.Fatal(err)
}
}
@@ -223,7 +223,7 @@ func testPartITAnalyseCDRs(t *testing.T) {
}
func testPartITKillEngine(t *testing.T) {
if err := engine.KillEngine(*waitRater); err != nil {
if err := engine.KillEngine(*utils.WaitRater); err != nil {
t.Error(err)
}
}

4
ers/sql_it_test.go
View File

@@ -77,7 +77,7 @@ var (
)
func TestSQL(t *testing.T) {
// sqlCfgPath = path.Join(*dataDir, "conf", "samples", "ers_reload", "disabled")
// sqlCfgPath = path.Join(*utils.DataDir, "conf", "samples", "ers_reload", "disabled")
for _, test := range sqlTests {
t.Run("TestSQL", test)
}
@@ -358,7 +358,7 @@ func TestSQLReaderServeBadTypeErr(t *testing.T) {
}
func TestSQL2(t *testing.T) {
// sqlCfgPath = path.Join(*dataDir, "conf", "samples", "ers_reload", "disabled")
// sqlCfgPath = path.Join(*utils.DataDir, "conf", "samples", "ers_reload", "disabled")
for _, test := range sqlTests2 {
t.Run("TestSQL", test)
}