From 25a0b3ea2c59f7e28e889ed02cd8138742c25794 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Thu, 5 Dec 2019 08:08:37 +0200 Subject: [PATCH] Updated integration tests --- agents/httpagent_it_test.go | 4 ++-- apier/v1/accounts_it_test.go | 4 ++-- engine/actions_it_test.go | 2 +- sessions/sessions_data_it_test.go | 2 +- sessions/sessions_it_test.go | 2 +- sessions/sessions_rpl_it_test.go | 4 ++-- sessions/sessions_voice_it_test.go | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/agents/httpagent_it_test.go b/agents/httpagent_it_test.go index 757055354..bece893d8 100644 --- a/agents/httpagent_it_test.go +++ b/agents/httpagent_it_test.go @@ -63,7 +63,7 @@ var sTestsHA = []func(t *testing.T){ func TestHAitSimple(t *testing.T) { haCfgPath = path.Join(*dataDir, "conf", "samples", "httpagent") if *encoding == utils.MetaGOB { - haCfgPath = path.Join(*dataDir, "conf", "samples", "httpagent"+"_gob") + haCfgPath = path.Join(*dataDir, "conf", "samples", "httpagent_gob") } // Init config first var err error @@ -82,7 +82,7 @@ func TestHAitSimple(t *testing.T) { func TestHA2itWithTls(t *testing.T) { haCfgPath = path.Join(*dataDir, "conf", "samples", "httpagenttls") if *encoding == utils.MetaGOB { - haCfgPath = path.Join(*dataDir, "conf", "samples", "httpagenttls"+"_gob") + haCfgPath = path.Join(*dataDir, "conf", "samples", "httpagenttls_gob") } // Init config first var err error diff --git a/apier/v1/accounts_it_test.go b/apier/v1/accounts_it_test.go index 391592537..7f84c814e 100644 --- a/apier/v1/accounts_it_test.go +++ b/apier/v1/accounts_it_test.go @@ -63,7 +63,7 @@ func TestAccITWithRemove(t *testing.T) { if *encoding == utils.MetaJSON { accCfgPath = path.Join(*dataDir, "conf", "samples", "tutmongo") } else if *encoding == utils.MetaGOB { - accCfgPath = path.Join(*dataDir, "conf", "samples", "tutmongo"+"_gob") + accCfgPath = path.Join(*dataDir, "conf", "samples", "tutmongo_gob") } for _, test := range accTests { t.Run("TestAccIT", test) @@ -74,7 +74,7 @@ func TestAccITWithoutRemove(t *testing.T) { if *encoding == utils.MetaJSON { accCfgPath = path.Join(*dataDir, "conf", "samples", "acc_balance_keep") } else if *encoding == utils.MetaGOB { - accCfgPath = path.Join(*dataDir, "conf", "samples", "acc_balance_keep"+"_gob") + accCfgPath = path.Join(*dataDir, "conf", "samples", "acc_balance_keep_gob") } accExist = true for _, test := range accTests { diff --git a/engine/actions_it_test.go b/engine/actions_it_test.go index 8580ff675..b1aec45f4 100644 --- a/engine/actions_it_test.go +++ b/engine/actions_it_test.go @@ -56,7 +56,7 @@ func newRPCClient(cfg *config.ListenCfg) (c *rpc.Client, err error) { func TestActionsitInitCfg(t *testing.T) { if *encoding == utils.MetaGOB { - actsLclCfgPath = path.Join(*dataDir, "conf", "samples", "actions"+"_gob") + actsLclCfgPath = path.Join(*dataDir, "conf", "samples", "actions_gob") } // Init config first var err error diff --git a/sessions/sessions_data_it_test.go b/sessions/sessions_data_it_test.go index eb0e59cad..492829903 100644 --- a/sessions/sessions_data_it_test.go +++ b/sessions/sessions_data_it_test.go @@ -37,7 +37,7 @@ var sDataRPC *rpc.Client func TestSessionsDataInitCfg(t *testing.T) { dataCfgPath = path.Join(*dataDir, "conf", "samples", "smg") if *encoding == utils.MetaGOB { - dataCfgPath = path.Join(*dataDir, "conf", "samples", "smg"+"_gob") + dataCfgPath = path.Join(*dataDir, "conf", "samples", "smg_gob") } // Init config first var err error diff --git a/sessions/sessions_it_test.go b/sessions/sessions_it_test.go index a6605df72..82e8acd91 100644 --- a/sessions/sessions_it_test.go +++ b/sessions/sessions_it_test.go @@ -38,7 +38,7 @@ var sItRPC *rpc.Client func TestSessionsItInitCfg(t *testing.T) { sItCfgPath = path.Join(*dataDir, "conf", "samples", "smg") if *encoding == utils.MetaGOB { - dataCfgPath = path.Join(*dataDir, "conf", "samples", "smg"+"_gob") + dataCfgPath = path.Join(*dataDir, "conf", "samples", "smg_gob") } // Init config first var err error diff --git a/sessions/sessions_rpl_it_test.go b/sessions/sessions_rpl_it_test.go index 82f8f09a6..6d93fb0b4 100644 --- a/sessions/sessions_rpl_it_test.go +++ b/sessions/sessions_rpl_it_test.go @@ -38,7 +38,7 @@ var smgRplcMstrRPC, smgRplcSlvRPC *rpc.Client func TestSessionSRplInitCfg(t *testing.T) { smgRplcMasterCfgPath = path.Join(*dataDir, "conf", "samples", "smgreplcmaster") if *encoding == utils.MetaGOB { - smgRplcMasterCfgPath = path.Join(*dataDir, "conf", "samples", "smgreplcmaster"+"_gob") + smgRplcMasterCfgPath = path.Join(*dataDir, "conf", "samples", "smgreplcmaster_gob") } if smgRplcMasterCfg, err = config.NewCGRConfigFromPath(smgRplcMasterCfgPath); err != nil { t.Fatal(err) @@ -47,7 +47,7 @@ func TestSessionSRplInitCfg(t *testing.T) { config.SetCgrConfig(smgRplcMasterCfg) smgRplcSlaveCfgPath = path.Join(*dataDir, "conf", "samples", "smgreplcslave") if *encoding == utils.MetaGOB { - smgRplcSlaveCfgPath = path.Join(*dataDir, "conf", "samples", "smgreplcslave"+"_gob") + smgRplcSlaveCfgPath = path.Join(*dataDir, "conf", "samples", "smgreplcslave_gob") } if smgRplcSlaveCfg, err = config.NewCGRConfigFromPath(smgRplcSlaveCfgPath); err != nil { t.Fatal(err) diff --git a/sessions/sessions_voice_it_test.go b/sessions/sessions_voice_it_test.go index 2d226848a..ae8f29546 100644 --- a/sessions/sessions_voice_it_test.go +++ b/sessions/sessions_voice_it_test.go @@ -58,7 +58,7 @@ func newRPCClient(cfg *config.ListenCfg) (c *rpc.Client, err error) { func TestSessionsVoiceInitCfg(t *testing.T) { voiceCfgPath = path.Join(*dataDir, "conf", "samples", "smg") if *encoding == utils.MetaGOB { - dataCfgPath = path.Join(*dataDir, "conf", "samples", "smg"+"_gob") + dataCfgPath = path.Join(*dataDir, "conf", "samples", "smg_gob") } // Init config first var err error