diff --git a/engine/libtest.go b/engine/libtest.go index 074354c76..4a0a57aac 100644 --- a/engine/libtest.go +++ b/engine/libtest.go @@ -20,7 +20,6 @@ package engine import ( "bytes" - "errors" "fmt" "io" "os" @@ -349,15 +348,24 @@ func LoadAllDataDBToCache(dm *DataManager) (err error) { return } -func NewRPCClient(cfg *config.ListenCfg) (c *birpc.Client, err error) { +// NewRPCClient creates and returns a new RPC client for cgr-engine. +func NewRPCClient(t *testing.T, cfg *config.ListenCfg) *birpc.Client { + t.Helper() + var err error + var client *birpc.Client switch *utils.Encoding { case utils.MetaJSON: - return jsonrpc.Dial(utils.TCP, cfg.RPCJSONListen) + client, err = jsonrpc.Dial(utils.TCP, cfg.RPCJSONListen) case utils.MetaGOB: - return birpc.Dial(utils.TCP, cfg.RPCGOBListen) + client, err = birpc.Dial(utils.TCP, cfg.RPCGOBListen) default: - return nil, errors.New("UNSUPPORTED_RPC") + t.Fatalf("unsupported RPC encoding: %s", *utils.Encoding) } + if err != nil { + t.Fatalf("unable to connect to cgr-engine: %v", err) + } + return client + } // TestEngine holds the setup parameters and configurations @@ -407,11 +415,7 @@ func (ng TestEngine) Run(t *testing.T) (*birpc.Client, *config.CGRConfig) { } startEngine(t, cfg, ng.LogBuffer) - - client, err := NewRPCClient(cfg.ListenCfg()) - if err != nil { - t.Fatalf("could not connect to cgr-engine: %v", err) - } + client := NewRPCClient(t, cfg.ListenCfg()) var customTpPath string if len(ng.TpFiles) != 0 { diff --git a/engine/z_actions2_it_test.go b/engine/z_actions2_it_test.go index d38a7d174..0d9e97a42 100644 --- a/engine/z_actions2_it_test.go +++ b/engine/z_actions2_it_test.go @@ -133,11 +133,7 @@ func testActionsStartEngine(t *testing.T) { // Connect rpc client to rater func testActionsRPCConn(t *testing.T) { - var err error - actsRPC, err = NewRPCClient(actsCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed - if err != nil { - t.Fatal(err) - } + actsRPC = NewRPCClient(t, actsCfg.ListenCfg()) } func testActionsSetSMCosts(t *testing.T) { diff --git a/engine/z_actions_it_test.go b/engine/z_actions_it_test.go index 89edae0dd..292b4061e 100644 --- a/engine/z_actions_it_test.go +++ b/engine/z_actions_it_test.go @@ -114,12 +114,7 @@ func testActionsitStartEngine(t *testing.T) { // Connect rpc client to rater func testActionsitRpcConn(t *testing.T) { - var err error - // time.Sleep(500 * time.Millisecond) - actsLclRpc, err = NewRPCClient(actsLclCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed - if err != nil { - t.Fatal(err) - } + actsLclRpc = NewRPCClient(t, actsLclCfg.ListenCfg()) } func testActionsitSetCdrlogDebit(t *testing.T) { diff --git a/general_tests/a1_it_test.go b/general_tests/a1_it_test.go index f6efa19f4..864d4d849 100644 --- a/general_tests/a1_it_test.go +++ b/general_tests/a1_it_test.go @@ -104,11 +104,7 @@ func testA1itStartEngine(t *testing.T) { } func testA1itRPCConn(t *testing.T) { - var err error - a1rpc, err = engine.NewRPCClient(a1Cfg.ListenCfg()) - if err != nil { - t.Fatal(err) - } + a1rpc = engine.NewRPCClient(t, a1Cfg.ListenCfg()) } func testA1itLoadTPFromFolder(t *testing.T) { diff --git a/general_tests/accounts_it_test.go b/general_tests/accounts_it_test.go index 7c9b62038..e508764d2 100644 --- a/general_tests/accounts_it_test.go +++ b/general_tests/accounts_it_test.go @@ -110,11 +110,7 @@ func testV1AccStartEngine(t *testing.T) { } func testV1AccRpcConn(t *testing.T) { - var err error - accRpc, err = engine.NewRPCClient(accCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed - if err != nil { - t.Fatal("Could not connect to rater: ", err.Error()) - } + accRpc = engine.NewRPCClient(t, accCfg.ListenCfg()) } func testV1AccGetAccountBeforeSet(t *testing.T) { diff --git a/general_tests/accountswiththresholds_it_test.go b/general_tests/accountswiththresholds_it_test.go index 0907b5f11..9993cdcc6 100644 --- a/general_tests/accountswiththresholds_it_test.go +++ b/general_tests/accountswiththresholds_it_test.go @@ -107,11 +107,7 @@ func testAccWThdStartEngine(t *testing.T) { } func testAccWThdRpcConn(t *testing.T) { - var err error - accWThdRpc, err = engine.NewRPCClient(accWThdCfg.ListenCfg()) // We connect over JSON so we can troubleshoot if needed - if err != nil { - t.Fatal("Could not connect to rater: ", err.Error()) - } + accWThdRpc = engine.NewRPCClient(t, accWThdCfg.ListenCfg()) } func testAccWThdSetThresholdProfile(t *testing.T) { diff --git a/general_tests/attributes_filters_index_it_test.go b/general_tests/attributes_filters_index_it_test.go index fc5443dce..6f45ec96a 100644 --- a/general_tests/attributes_filters_index_it_test.go +++ b/general_tests/attributes_filters_index_it_test.go @@ -104,11 +104,7 @@ func testAttributeFltrSStartEngine(t *testing.T) { // Connect rpc client to rater func testAttributeFltrSRPCConn(t *testing.T) { - var err error - attrFltrRPC, err = engine.NewRPCClient(attrFltrCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed - if err != nil { - t.Fatal(err) - } + attrFltrRPC = engine.NewRPCClient(t, attrFltrCfg.ListenCfg()) } func testAttributeSetFltr1(t *testing.T) { diff --git a/general_tests/attributes_it_test.go b/general_tests/attributes_it_test.go index 5479565a7..1b1198770 100644 --- a/general_tests/attributes_it_test.go +++ b/general_tests/attributes_it_test.go @@ -111,11 +111,7 @@ func testAttributeSStartEngine(t *testing.T) { // Connect rpc client to rater func testAttributeSRPCConn(t *testing.T) { - var err error - attrRPC, err = engine.NewRPCClient(attrCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed - if err != nil { - t.Fatal(err) - } + attrRPC = engine.NewRPCClient(t, attrCfg.ListenCfg()) } func testAttributeSLoadFromFolder(t *testing.T) { diff --git a/general_tests/cacherpl_it_test.go b/general_tests/cacherpl_it_test.go index dd999f9b5..d6c81b195 100644 --- a/general_tests/cacherpl_it_test.go +++ b/general_tests/cacherpl_it_test.go @@ -174,19 +174,9 @@ func testCacheRplStartEngine(t *testing.T) { } func testCacheRplRpcConn(t *testing.T) { - var err error - dspEngine1RPC, err = engine.NewRPCClient(dspEngine1Cfg.ListenCfg()) - if err != nil { - t.Fatal(err) - } - dspEngine2RPC, err = engine.NewRPCClient(dspEngine2Cfg.ListenCfg()) - if err != nil { - t.Fatal(err) - } - engine1RPC, err = engine.NewRPCClient(engine1Cfg.ListenCfg()) - if err != nil { - t.Fatal(err) - } + dspEngine1RPC = engine.NewRPCClient(t, dspEngine1Cfg.ListenCfg()) + dspEngine2RPC = engine.NewRPCClient(t, dspEngine2Cfg.ListenCfg()) + engine1RPC = engine.NewRPCClient(t, engine1Cfg.ListenCfg()) } func testCacheRplAddData(t *testing.T) { diff --git a/general_tests/cdrs_exp_it_test.go b/general_tests/cdrs_exp_it_test.go index f7e55a9f1..cd51ad671 100644 --- a/general_tests/cdrs_exp_it_test.go +++ b/general_tests/cdrs_exp_it_test.go @@ -214,10 +214,7 @@ func testCDRsExpStartEngine(t *testing.T) { } func testCDRsExpInitRPC(t *testing.T) { - var err error - if cdrsExpRPC, err = engine.NewRPCClient(cdrsExpCfg.ListenCfg()); err != nil { - t.Fatal(err) - } + cdrsExpRPC = engine.NewRPCClient(t, cdrsExpCfg.ListenCfg()) } func testCDRsExpLoadAddCharger(t *testing.T) { diff --git a/general_tests/cdrs_internal_it_test.go b/general_tests/cdrs_internal_it_test.go index bc13aaa33..dfc034a83 100644 --- a/general_tests/cdrs_internal_it_test.go +++ b/general_tests/cdrs_internal_it_test.go @@ -86,11 +86,7 @@ func testCdrsIntStartEngine(t *testing.T) { } func testCdrsIntRpcConn(t *testing.T) { - var err error - cdrsIntRPC, err = engine.NewRPCClient(cdrsIntCfg.ListenCfg()) - if err != nil { - t.Fatal(err) - } + cdrsIntRPC = engine.NewRPCClient(t, cdrsIntCfg.ListenCfg()) } func testCdrsIntTestTTL(t *testing.T) { diff --git a/general_tests/cdrs_it_test.go b/general_tests/cdrs_it_test.go index 32d0994a1..d33d61316 100644 --- a/general_tests/cdrs_it_test.go +++ b/general_tests/cdrs_it_test.go @@ -130,11 +130,7 @@ func testV2CDRsStartEngine(t *testing.T) { // Connect rpc client to rater func testV2CDRsRpcConn(t *testing.T) { - var err error - cdrsRpc, err = engine.NewRPCClient(cdrsCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed - if err != nil { - t.Fatal("Could not connect to rater: ", err.Error()) - } + cdrsRpc = engine.NewRPCClient(t, cdrsCfg.ListenCfg()) } func testV2CDRsLoadTariffPlanFromFolder(t *testing.T) { diff --git a/general_tests/cdrs_post_failover_it_test.go b/general_tests/cdrs_post_failover_it_test.go index 3f9b03bed..6d1854614 100644 --- a/general_tests/cdrs_post_failover_it_test.go +++ b/general_tests/cdrs_post_failover_it_test.go @@ -110,11 +110,7 @@ func testCDRsPostFailoverStartEngine(t *testing.T) { // Connect rpc client to rater func testCDRsPostFailoverRpcConn(t *testing.T) { - var err error - cdrsPostFailRpc, err = engine.NewRPCClient(cdrsPostFailCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed - if err != nil { - t.Fatal("Could not connect to rater: ", err.Error()) - } + cdrsPostFailRpc = engine.NewRPCClient(t, cdrsPostFailCfg.ListenCfg()) } func testCDRsPostFailoverLoadTariffPlanFromFolder(t *testing.T) { diff --git a/general_tests/cdrs_processevent_it_test.go b/general_tests/cdrs_processevent_it_test.go index d8cb76af9..39d3fabbc 100644 --- a/general_tests/cdrs_processevent_it_test.go +++ b/general_tests/cdrs_processevent_it_test.go @@ -120,11 +120,7 @@ func testV1CDRsStartEngine(t *testing.T) { } func testV1CDRsRpcConn(t *testing.T) { - var err error - pecdrsRpc, err = engine.NewRPCClient(pecdrsCfg.ListenCfg()) - if err != nil { - t.Fatal("Could not connect to rater: ", err.Error()) - } + pecdrsRpc = engine.NewRPCClient(t, pecdrsCfg.ListenCfg()) } func testV1CDRsLoadTariffPlanFromFolder(t *testing.T) { diff --git a/general_tests/cgrloader_it_test.go b/general_tests/cgrloader_it_test.go index d42ea2694..ccefe0ff3 100644 --- a/general_tests/cgrloader_it_test.go +++ b/general_tests/cgrloader_it_test.go @@ -103,11 +103,7 @@ func testCGRLoaderStartEngine(t *testing.T) { } func testCGRLoaderRpcConn(t *testing.T) { - var err error - cgrloaderRPC, err = engine.NewRPCClient(cgrloaderCfg.ListenCfg()) - if err != nil { - t.Fatal("Could not connect to rater: ", err.Error()) - } + cgrloaderRPC = engine.NewRPCClient(t, cgrloaderCfg.ListenCfg()) } func testCGRLoaderLoadData(t *testing.T) { diff --git a/general_tests/data_it_test.go b/general_tests/data_it_test.go index 80db3dd6e..eba5eef88 100644 --- a/general_tests/data_it_test.go +++ b/general_tests/data_it_test.go @@ -108,11 +108,7 @@ func testV1DataStartEngine(t *testing.T) { } func testV1DataRpcConn(t *testing.T) { - var err error - dataRpc, err = engine.NewRPCClient(dataCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed - if err != nil { - t.Fatal("Could not connect to rater: ", err.Error()) - } + dataRpc = engine.NewRPCClient(t, dataCfg.ListenCfg()) } func testV1DataGetAccountBeforeSet(t *testing.T) { diff --git a/general_tests/destination_combined_it_test.go b/general_tests/destination_combined_it_test.go index f0670d42a..f01f867c6 100644 --- a/general_tests/destination_combined_it_test.go +++ b/general_tests/destination_combined_it_test.go @@ -92,11 +92,7 @@ func testDestinationStartEngine(t *testing.T) { } func testDestinationRpcConn(t *testing.T) { - var err error - tutorialRpc, err = engine.NewRPCClient(tutorialCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed - if err != nil { - t.Fatal("Could not connect to rater: ", err.Error()) - } + tutorialRpc = engine.NewRPCClient(t, tutorialCfg.ListenCfg()) } func testDestinationFromFolder(t *testing.T) { diff --git a/general_tests/doubleremove_it_test.go b/general_tests/doubleremove_it_test.go index eb65c1916..892dd15c3 100644 --- a/general_tests/doubleremove_it_test.go +++ b/general_tests/doubleremove_it_test.go @@ -96,11 +96,7 @@ func testdoubleRemoveStartEngine(t *testing.T) { } func testdoubleRemoveRpcConn(t *testing.T) { - var err error - sesRPC, err = engine.NewRPCClient(doubleRemove.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed - if err != nil { - t.Fatal("Could not connect to rater: ", err.Error()) - } + sesRPC = engine.NewRPCClient(t, doubleRemove.ListenCfg()) } func testdoubleRemoveStatQueueProfile(t *testing.T) { diff --git a/general_tests/export_it_test.go b/general_tests/export_it_test.go index 4d2b1a915..89d1c5e10 100644 --- a/general_tests/export_it_test.go +++ b/general_tests/export_it_test.go @@ -112,11 +112,7 @@ func testExpStartEngine(t *testing.T) { } func testExpRPCConn(t *testing.T) { - var err error - expRpc, err = engine.NewRPCClient(expCfg.ListenCfg()) - if err != nil { - t.Fatal(err) - } + expRpc = engine.NewRPCClient(t, expCfg.ListenCfg()) } func testExpLoadTPFromFolder(t *testing.T) { diff --git a/general_tests/filtered_replication_it_test.go b/general_tests/filtered_replication_it_test.go index 1cf2cadfe..458d5d2b8 100644 --- a/general_tests/filtered_replication_it_test.go +++ b/general_tests/filtered_replication_it_test.go @@ -138,19 +138,12 @@ func testFltrRplStartEngine(t *testing.T) { } func testFltrRplRPCConn(t *testing.T) { - var err error tmp := *utils.Encoding // run only under *gob encoding *utils.Encoding = utils.MetaGOB - if fltrRplInternalRPC, err = engine.NewRPCClient(fltrRplInternalCfg.ListenCfg()); err != nil { - t.Fatal(err) - } - if fltrRplEngine1RPC, err = engine.NewRPCClient(fltrRplEngine1Cfg.ListenCfg()); err != nil { - t.Fatal(err) - } - if fltrRplEngine2RPC, err = engine.NewRPCClient(fltrRplEngine2Cfg.ListenCfg()); err != nil { - t.Fatal(err) - } + fltrRplInternalRPC = engine.NewRPCClient(t, fltrRplInternalCfg.ListenCfg()) + fltrRplEngine1RPC = engine.NewRPCClient(t, fltrRplEngine1Cfg.ListenCfg()) + fltrRplEngine2RPC = engine.NewRPCClient(t, fltrRplEngine2Cfg.ListenCfg()) *utils.Encoding = tmp } diff --git a/general_tests/filters_it_test.go b/general_tests/filters_it_test.go index 34b528107..b2922a3d2 100644 --- a/general_tests/filters_it_test.go +++ b/general_tests/filters_it_test.go @@ -125,11 +125,7 @@ func testV1FltrStartEngine(t *testing.T) { } func testV1FltrRpcConn(t *testing.T) { - var err error - fltrRpc, err = engine.NewRPCClient(fltrCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed - if err != nil { - t.Fatal("Could not connect to rater: ", err.Error()) - } + fltrRpc = engine.NewRPCClient(t, fltrCfg.ListenCfg()) } func testV1FltrLoadTarrifPlans(t *testing.T) { diff --git a/general_tests/fltr_sep_it_test.go b/general_tests/fltr_sep_it_test.go index b66d8a65e..49f4c1d94 100644 --- a/general_tests/fltr_sep_it_test.go +++ b/general_tests/fltr_sep_it_test.go @@ -102,11 +102,7 @@ func testFltrSepStartEngine(t *testing.T) { } func testFltrSepRpcConn(t *testing.T) { - var err error - fltrSepRPC, err = engine.NewRPCClient(fltrSepCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed - if err != nil { - t.Fatal("Could not connect to rater: ", err.Error()) - } + fltrSepRPC = engine.NewRPCClient(t, fltrSepCfg.ListenCfg()) } func testFltrSepLoadTarrifPlans(t *testing.T) { diff --git a/general_tests/gocs_it_test.go b/general_tests/gocs_it_test.go index 46192282b..5a82ba119 100644 --- a/general_tests/gocs_it_test.go +++ b/general_tests/gocs_it_test.go @@ -127,16 +127,9 @@ func testGOCSStartEngine(t *testing.T) { // Connect rpc client to rater func testGOCSApierRpcConn(t *testing.T) { - var err error - if auRPC, err = engine.NewRPCClient(auCfg.ListenCfg()); err != nil { - t.Fatal(err) - } - if usRPC, err = engine.NewRPCClient(usCfg.ListenCfg()); err != nil { - t.Fatal(err) - } - if dspRPC, err = engine.NewRPCClient(dspCfg.ListenCfg()); err != nil { - t.Fatal(err) - } + auRPC = engine.NewRPCClient(t, auCfg.ListenCfg()) + usRPC = engine.NewRPCClient(t, usCfg.ListenCfg()) + dspRPC = engine.NewRPCClient(t, dspCfg.ListenCfg()) } func testGOCSLoadData(t *testing.T) { diff --git a/general_tests/loader_nocontext_it_test.go b/general_tests/loader_nocontext_it_test.go index fd010510e..fd2a16306 100644 --- a/general_tests/loader_nocontext_it_test.go +++ b/general_tests/loader_nocontext_it_test.go @@ -112,11 +112,7 @@ func testLoaderNoContextStartEngine(t *testing.T) { } func testLoaderNoContextRpcConn(t *testing.T) { - var err error - ldrCtxRPC, err = engine.NewRPCClient(ldrCtxCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed - if err != nil { - t.Fatal("Could not connect to rater: ", err.Error()) - } + ldrCtxRPC = engine.NewRPCClient(t, ldrCtxCfg.ListenCfg()) } func testLoaderNoContextWriteCSVs(t *testing.T) { diff --git a/general_tests/loaders_internal_indexes_it_test.go b/general_tests/loaders_internal_indexes_it_test.go index e67e8da1d..157e4d5f5 100644 --- a/general_tests/loaders_internal_indexes_it_test.go +++ b/general_tests/loaders_internal_indexes_it_test.go @@ -102,13 +102,8 @@ func testLoadersIDBIdxItStartEngines(t *testing.T) { } func testLoadersIDBIdxItRPCConn(t *testing.T) { - var err error - if loadersIDBIdxRPC, err = engine.NewRPCClient(loadersIDBIdxCfg.ListenCfg()); err != nil { - t.Fatal(err) - } - if loadersIDBIdxRPCInternal, err = engine.NewRPCClient(loadersIDBIdxCfgInternal.ListenCfg()); err != nil { - t.Fatal(err) - } + loadersIDBIdxRPC = engine.NewRPCClient(t, loadersIDBIdxCfg.ListenCfg()) + loadersIDBIdxRPCInternal = engine.NewRPCClient(t, loadersIDBIdxCfgInternal.ListenCfg()) } func testLoadersIDBIdxItLoad(t *testing.T) { diff --git a/general_tests/poster_it_test.go b/general_tests/poster_it_test.go index 389d3917a..37a1c6dd9 100644 --- a/general_tests/poster_it_test.go +++ b/general_tests/poster_it_test.go @@ -115,11 +115,7 @@ func testPosterITStartEngine(t *testing.T) { } func testPosterITRpcConn(t *testing.T) { - var err error - pstrRpc, err = engine.NewRPCClient(pstrCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed - if err != nil { - t.Fatal(err) - } + pstrRpc = engine.NewRPCClient(t, pstrCfg.ListenCfg()) } func testPosterReadFolder(format string) (expEv *ees.ExportEvents, err error) { diff --git a/general_tests/redis_cluster_it_test.go b/general_tests/redis_cluster_it_test.go index 3f96ab39c..daff05a19 100644 --- a/general_tests/redis_cluster_it_test.go +++ b/general_tests/redis_cluster_it_test.go @@ -181,11 +181,7 @@ func testClsrStartEngine(t *testing.T) { } func testClsrRPCConection(t *testing.T) { - var err error - clsrRPC, err = engine.NewRPCClient(clsrConfig.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed - if err != nil { - t.Fatal(err) - } + clsrRPC = engine.NewRPCClient(t, clsrConfig.ListenCfg()) } func testClsrSetGetAttribute(t *testing.T) { diff --git a/general_tests/redis_tls_it_test.go b/general_tests/redis_tls_it_test.go index 0baa2fab9..b12af7164 100644 --- a/general_tests/redis_tls_it_test.go +++ b/general_tests/redis_tls_it_test.go @@ -98,11 +98,7 @@ func testRedisTLSStartEngine(t *testing.T) { } func testRedisTLSRPCCon(t *testing.T) { - var err error - redisTLSRPC, err = engine.NewRPCClient(redisTLSCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed - if err != nil { - t.Fatal(err) - } + redisTLSRPC = engine.NewRPCClient(t, redisTLSCfg.ListenCfg()) } func testRedisTLSSetGetAttribute(t *testing.T) { diff --git a/general_tests/rerate_ers_cdrs_it_test.go b/general_tests/rerate_ers_cdrs_it_test.go index f63eb5227..5fae2318f 100644 --- a/general_tests/rerate_ers_cdrs_it_test.go +++ b/general_tests/rerate_ers_cdrs_it_test.go @@ -121,11 +121,7 @@ func testRerateCDRsERsStartEngine(t *testing.T) { } func testRerateCDRsERsRPCConn(t *testing.T) { - var err error - rrErsCdrsRPC, err = engine.NewRPCClient(rrErsCdrsCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed - if err != nil { - t.Fatal("Could not connect to rater: ", err.Error()) - } + rrErsCdrsRPC = engine.NewRPCClient(t, rrErsCdrsCfg.ListenCfg()) } func testRerateCDRsERsLoadTP(t *testing.T) { diff --git a/general_tests/rerate_exp_it_test.go b/general_tests/rerate_exp_it_test.go index 3977e0bce..50e386288 100644 --- a/general_tests/rerate_exp_it_test.go +++ b/general_tests/rerate_exp_it_test.go @@ -135,15 +135,8 @@ func testRerateExpStartEngine(t *testing.T) { } func testRerateExpRPCConn(t *testing.T) { - var err error - ng1RPC, err = engine.NewRPCClient(ng1Cfg.ListenCfg()) - if err != nil { - t.Fatal("Could not connect to rater: ", err.Error()) - } - ng2RPC, err = engine.NewRPCClient(ng2Cfg.ListenCfg()) - if err != nil { - t.Fatal("Could not connect to rater: ", err.Error()) - } + ng1RPC = engine.NewRPCClient(t, ng1Cfg.ListenCfg()) + ng2RPC = engine.NewRPCClient(t, ng2Cfg.ListenCfg()) } func testRerateExpLoadTP(t *testing.T) { diff --git a/general_tests/routes_cases_it_test.go b/general_tests/routes_cases_it_test.go index a59bde223..9b017d231 100644 --- a/general_tests/routes_cases_it_test.go +++ b/general_tests/routes_cases_it_test.go @@ -125,11 +125,7 @@ func testV1RtsCaseStartEngine(t *testing.T) { } func testV1RtsCaseRpcConn(t *testing.T) { - var err error - rtsCaseSv1Rpc, err = engine.NewRPCClient(rtsCaseSv1Cfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed - if err != nil { - t.Fatal("Could not connect to rater: ", err.Error()) - } + rtsCaseSv1Rpc = engine.NewRPCClient(t, rtsCaseSv1Cfg.ListenCfg()) } func testV1RtsCaseFromFolder(t *testing.T) { diff --git a/general_tests/rpccaching_it_test.go b/general_tests/rpccaching_it_test.go index bd1716e3e..854d7abc3 100644 --- a/general_tests/rpccaching_it_test.go +++ b/general_tests/rpccaching_it_test.go @@ -118,11 +118,7 @@ func testRPCMethodsStartEngine(t *testing.T) { } func testRPCMethodsRpcConn(t *testing.T) { - var err error - rpcRpc, err = engine.NewRPCClient(rpcCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed - if err != nil { - t.Fatal("Could not connect to rater: ", err.Error()) - } + rpcRpc = engine.NewRPCClient(t, rpcCfg.ListenCfg()) } func testRPCMethodsFromFolder(t *testing.T) { diff --git a/general_tests/sentinel_it_test.go b/general_tests/sentinel_it_test.go index 8a7ea02a7..5728af8b1 100644 --- a/general_tests/sentinel_it_test.go +++ b/general_tests/sentinel_it_test.go @@ -132,11 +132,7 @@ func testRedisSentinelStartEngine(t *testing.T) { } func testRedisSentinelRPCCon(t *testing.T) { - var err error - sentinelRPC, err = engine.NewRPCClient(sentinelConfig.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed - if err != nil { - t.Fatal(err) - } + sentinelRPC = engine.NewRPCClient(t, sentinelConfig.ListenCfg()) } func testRedisSentinelSetGetAttribute(t *testing.T) { diff --git a/general_tests/session2_it_test.go b/general_tests/session2_it_test.go index b4e2f4627..b4c4f1afa 100644 --- a/general_tests/session2_it_test.go +++ b/general_tests/session2_it_test.go @@ -102,11 +102,7 @@ func testSes2ItStartEngine(t *testing.T) { } func testSes2ItRPCConn(t *testing.T) { - var err error - ses2RPC, err = engine.NewRPCClient(ses2Cfg.ListenCfg()) - if err != nil { - t.Fatal(err) - } + ses2RPC = engine.NewRPCClient(t, ses2Cfg.ListenCfg()) } func testSes2ItLoadFromFolder(t *testing.T) { diff --git a/general_tests/session4_it_test.go b/general_tests/session4_it_test.go index afe8cee68..06f54a982 100644 --- a/general_tests/session4_it_test.go +++ b/general_tests/session4_it_test.go @@ -99,11 +99,7 @@ func testSes4ItStartEngine(t *testing.T) { } func testSes4ItRPCConn(t *testing.T) { - var err error - ses4RPC, err = engine.NewRPCClient(ses4Cfg.ListenCfg()) - if err != nil { - t.Fatal(err) - } + ses4RPC = engine.NewRPCClient(t, ses4Cfg.ListenCfg()) } func testSes4ItLoadFromFolder(t *testing.T) { diff --git a/general_tests/session_graceful_shutdown_it_test.go b/general_tests/session_graceful_shutdown_it_test.go index 4a2e0bd74..b7b0a7a63 100644 --- a/general_tests/session_graceful_shutdown_it_test.go +++ b/general_tests/session_graceful_shutdown_it_test.go @@ -121,13 +121,8 @@ func testSessionSRplcStartEngine(t *testing.T) { // Connect rpc client to rater func testSessionSRplcApierRpcConn(t *testing.T) { - var err error - if smgRplcRPC1, err = engine.NewRPCClient(smgRplCfg1.ListenCfg()); err != nil { - t.Fatal(err) - } - if smgRplcRPC2, err = engine.NewRPCClient(smgRplCfg2.ListenCfg()); err != nil { - t.Fatal(err) - } + smgRplcRPC1 = engine.NewRPCClient(t, smgRplCfg1.ListenCfg()) + smgRplcRPC2 = engine.NewRPCClient(t, smgRplCfg2.ListenCfg()) } func testSessionSRplcApierGetActiveSessionsNotFound(t *testing.T) { diff --git a/general_tests/session_it_test.go b/general_tests/session_it_test.go index 2eaba8c3c..2a618d4f8 100644 --- a/general_tests/session_it_test.go +++ b/general_tests/session_it_test.go @@ -101,11 +101,7 @@ func testSesItStartEngine(t *testing.T) { } func testSesItRPCConn(t *testing.T) { - var err error - sesRPC, err = engine.NewRPCClient(sesCfg.ListenCfg()) - if err != nil { - t.Fatal(err) - } + sesRPC = engine.NewRPCClient(t, sesCfg.ListenCfg()) } func testSesItLoadFromFolder(t *testing.T) { diff --git a/general_tests/session_money_rating_subject_it_test.go b/general_tests/session_money_rating_subject_it_test.go index 0e413f3e3..70dc7d7bc 100644 --- a/general_tests/session_money_rating_subject_it_test.go +++ b/general_tests/session_money_rating_subject_it_test.go @@ -120,10 +120,7 @@ func testSesMRSItStartEngine(t *testing.T) { } func testSesMRSItRPCConn(t *testing.T) { - var err error - if sesMRSRPC, err = engine.NewRPCClient(sesMRSCfg.ListenCfg()); err != nil { - t.Fatal(err) - } + sesMRSRPC = engine.NewRPCClient(t, sesMRSCfg.ListenCfg()) } func testSesMRSItLoadFromFolder(t *testing.T) { diff --git a/general_tests/session_nonereq_it_test.go b/general_tests/session_nonereq_it_test.go index 94100e250..6c6ca8b4f 100644 --- a/general_tests/session_nonereq_it_test.go +++ b/general_tests/session_nonereq_it_test.go @@ -100,11 +100,7 @@ func testSesNoneReqTypeItStartEngine(t *testing.T) { } func testSesNoneReqTypeItRPCConn(t *testing.T) { - var err error - sesNoneReqTypeRPC, err = engine.NewRPCClient(sesNoneReqTypeCfg.ListenCfg()) - if err != nil { - t.Fatal(err) - } + sesNoneReqTypeRPC = engine.NewRPCClient(t, sesNoneReqTypeCfg.ListenCfg()) } func testSesNoneReqTypeItAddChargerS(t *testing.T) { diff --git a/general_tests/session_refund_expired_it_test.go b/general_tests/session_refund_expired_it_test.go index 22d7d03b6..6f9588d83 100644 --- a/general_tests/session_refund_expired_it_test.go +++ b/general_tests/session_refund_expired_it_test.go @@ -123,10 +123,7 @@ func testSesExpItStartEngine(t *testing.T) { } func testSesExpItRPCConn(t *testing.T) { - var err error - if sesExpRPC, err = engine.NewRPCClient(sesExpCfg.ListenCfg()); err != nil { - t.Fatal(err) - } + sesExpRPC = engine.NewRPCClient(t, sesExpCfg.ListenCfg()) } func testSesExpItLoadFromFolder(t *testing.T) { diff --git a/general_tests/session_replications_automaticdebit_it_test.go b/general_tests/session_replications_automaticdebit_it_test.go index 41ba63273..7549328c9 100644 --- a/general_tests/session_replications_automaticdebit_it_test.go +++ b/general_tests/session_replications_automaticdebit_it_test.go @@ -145,13 +145,8 @@ func testSessionSRplStartEngine(t *testing.T) { // Connect rpc client to rater func testSessionSRplApierRpcConn(t *testing.T) { - var err error - if smgRplcMstrRPC, err = engine.NewRPCClient(smgRplcMasterCfg.ListenCfg()); err != nil { - t.Fatal(err) - } - if smgRplcSlvRPC, err = engine.NewRPCClient(smgRplcSlaveCfg.ListenCfg()); err != nil { - t.Fatal(err) - } + smgRplcMstrRPC = engine.NewRPCClient(t, smgRplcMasterCfg.ListenCfg()) + smgRplcSlvRPC = engine.NewRPCClient(t, smgRplcSlaveCfg.ListenCfg()) } // Load the tariff plan, creating accounts and their balances diff --git a/general_tests/session_rounding_it_test.go b/general_tests/session_rounding_it_test.go index 078d48ccb..806f5f3f9 100644 --- a/general_tests/session_rounding_it_test.go +++ b/general_tests/session_rounding_it_test.go @@ -179,10 +179,7 @@ func testSesRndItStartEngine(t *testing.T) { } func testSesRndItRPCConn(t *testing.T) { - var err error - if sesRndRPC, err = engine.NewRPCClient(sesRndCfg.ListenCfg()); err != nil { - t.Fatal(err) - } + sesRndRPC = engine.NewRPCClient(t, sesRndCfg.ListenCfg()) } func testSesRndItLoadRating(t *testing.T) { diff --git a/general_tests/session_rpl_prepaid_it_test.go b/general_tests/session_rpl_prepaid_it_test.go index 270dbb32c..85eea4037 100644 --- a/general_tests/session_rpl_prepaid_it_test.go +++ b/general_tests/session_rpl_prepaid_it_test.go @@ -93,10 +93,7 @@ func testSeSRplPrepaidStartEngine(t *testing.T) { // Connect rpc client to rater func testSeSRplPrepaidApierRpcConn(t *testing.T) { - var err error - if sesRplPrePaidRPC, err = engine.NewRPCClient(sesRplPrePaidCfg.ListenCfg()); err != nil { - t.Fatal(err) - } + sesRplPrePaidRPC = engine.NewRPCClient(t, sesRplPrePaidCfg.ListenCfg()) } // Load the tariff plan, creating accounts and their balances diff --git a/general_tests/sessionpause_it_test.go b/general_tests/sessionpause_it_test.go index 8b099fd0e..33c1f2e85 100644 --- a/general_tests/sessionpause_it_test.go +++ b/general_tests/sessionpause_it_test.go @@ -104,11 +104,7 @@ func testSesPauseItStartEngine(t *testing.T) { } func testSesPauseItRPCConn(t *testing.T) { - var err error - sesPauseRPC, err = engine.NewRPCClient(sesPauseCfg.ListenCfg()) - if err != nil { - t.Fatal(err) - } + sesPauseRPC = engine.NewRPCClient(t, sesPauseCfg.ListenCfg()) } func testSesPauseItLoadFromFolder(t *testing.T) { diff --git a/general_tests/sessionrefund_it_test.go b/general_tests/sessionrefund_it_test.go index 4af8d954f..cb258fc3c 100644 --- a/general_tests/sessionrefund_it_test.go +++ b/general_tests/sessionrefund_it_test.go @@ -103,11 +103,7 @@ func testSrItStartEngine(t *testing.T) { } func testSrItRPCConn(t *testing.T) { - var err error - srrpc, err = engine.NewRPCClient(srCfg.ListenCfg()) - if err != nil { - t.Fatal(err) - } + srrpc = engine.NewRPCClient(t, srCfg.ListenCfg()) } func testSrItLoadFromFolder(t *testing.T) { diff --git a/general_tests/sessionroutes_it_test.go b/general_tests/sessionroutes_it_test.go index a8e7be75b..612d1f74d 100644 --- a/general_tests/sessionroutes_it_test.go +++ b/general_tests/sessionroutes_it_test.go @@ -102,11 +102,7 @@ func testSesRoutesItStartEngine(t *testing.T) { } func testSesRoutesItRPCConn(t *testing.T) { - var err error - sesRoutesRPC, err = engine.NewRPCClient(sesRoutesCfg.ListenCfg()) - if err != nil { - t.Fatal(err) - } + sesRoutesRPC = engine.NewRPCClient(t, sesRoutesCfg.ListenCfg()) } func testSesRoutesItLoadFromFolder(t *testing.T) { diff --git a/general_tests/sessions_benchmark_it_test.go b/general_tests/sessions_benchmark_it_test.go index 7819524c9..19fe89186 100644 --- a/general_tests/sessions_benchmark_it_test.go +++ b/general_tests/sessions_benchmark_it_test.go @@ -108,11 +108,7 @@ func testSesPItStartEngineWithProfiling(t *testing.T) { } func testSesPItRPCConn(t *testing.T) { - var err error - sesPRPC, err = engine.NewRPCClient(sesPCfg.ListenCfg()) - if err != nil { - t.Fatal(err) - } + sesPRPC = engine.NewRPCClient(t, sesPCfg.ListenCfg()) } func setAccounts(t *testing.T, n int) (err error) { diff --git a/general_tests/sessions_tnt_change_cdr_it_test.go b/general_tests/sessions_tnt_change_cdr_it_test.go index a4db61d8b..3241b7e86 100644 --- a/general_tests/sessions_tnt_change_cdr_it_test.go +++ b/general_tests/sessions_tnt_change_cdr_it_test.go @@ -100,11 +100,7 @@ func testSesTntChngCdrsStartEngine(t *testing.T) { } func testSesTntChngCdrsRPCConn(t *testing.T) { - var err error - sesTntChngRPC, err = engine.NewRPCClient(sesTntChngCfg.ListenCfg()) - if err != nil { - t.Fatal(err) - } + sesTntChngRPC = engine.NewRPCClient(t, sesTntChngCfg.ListenCfg()) } func testSesTntChngCdrsSetChargerProfile1(t *testing.T) { diff --git a/general_tests/sessions_tnt_change_it_test.go b/general_tests/sessions_tnt_change_it_test.go index b89ca62d7..a744e5155 100644 --- a/general_tests/sessions_tnt_change_it_test.go +++ b/general_tests/sessions_tnt_change_it_test.go @@ -100,11 +100,7 @@ func testSesTntChngStartEngine(t *testing.T) { } func testSesTntChngRPCConn(t *testing.T) { - var err error - sesTntChngRPC, err = engine.NewRPCClient(sesTntChngCfg.ListenCfg()) - if err != nil { - t.Fatal(err) - } + sesTntChngRPC = engine.NewRPCClient(t, sesTntChngCfg.ListenCfg()) } func testSesTntChngSetChargerProfile1(t *testing.T) { diff --git a/general_tests/shared_client_lock_it_test.go b/general_tests/shared_client_lock_it_test.go index 1b270b99d..3feafefcd 100644 --- a/general_tests/shared_client_lock_it_test.go +++ b/general_tests/shared_client_lock_it_test.go @@ -140,11 +140,7 @@ func testSharedClientLockStartEngine(t *testing.T) { } func testSharedClientLockRpcConn(t *testing.T) { - var err error - clntLockRPC, err = engine.NewRPCClient(clntLockCfg.ListenCfg()) - if err != nil { - t.Fatal("Could not connect to engine: ", err.Error()) - } + clntLockRPC = engine.NewRPCClient(t, clntLockCfg.ListenCfg()) } func testSharedClientLockSetProfiles(t *testing.T) { diff --git a/general_tests/tp_it_test.go b/general_tests/tp_it_test.go index 579194a19..602bb1ff6 100644 --- a/general_tests/tp_it_test.go +++ b/general_tests/tp_it_test.go @@ -114,11 +114,7 @@ func testTpStartEngine(t *testing.T) { // Connect rpc client to rater func testTpRpcConn(t *testing.T) { - var err error - tpRPC, err = engine.NewRPCClient(tpCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed - if err != nil { - t.Fatal(err) - } + tpRPC = engine.NewRPCClient(t, tpCfg.ListenCfg()) } // Load the tariff plan, creating accounts and their balances diff --git a/general_tests/trends_aut_it_test.go b/general_tests/trends_aut_it_test.go index 85f2e4c0d..c446070f3 100644 --- a/general_tests/trends_aut_it_test.go +++ b/general_tests/trends_aut_it_test.go @@ -123,11 +123,7 @@ func testtrendAuQStartEngine(t *testing.T) { } func testtrendAuQRpcConn(t *testing.T) { - var err error - trendAuQRpc, err = engine.NewRPCClient(trendAuQCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed - if err != nil { - t.Fatal("Could not connect to rater: ", err.Error()) - } + trendAuQRpc = engine.NewRPCClient(t, trendAuQCfg.ListenCfg()) } func testtrendAuQFromFolder(t *testing.T) { diff --git a/general_tests/tut_smgeneric_it_test.go b/general_tests/tut_smgeneric_it_test.go index 2719cfb1a..d08d453c3 100644 --- a/general_tests/tut_smgeneric_it_test.go +++ b/general_tests/tut_smgeneric_it_test.go @@ -106,11 +106,7 @@ func testTutSMGStartEngine(t *testing.T) { // Connect rpc client to rater func testTutSMGRpcConn(t *testing.T) { - var err error - tutSMGRpc, err = engine.NewRPCClient(tutSMGCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed - if err != nil { - t.Fatal(err) - } + tutSMGRpc = engine.NewRPCClient(t, tutSMGCfg.ListenCfg()) } // Load the tariff plan, creating accounts and their balances diff --git a/general_tests/tutorial2_it_test.go b/general_tests/tutorial2_it_test.go index 32faa4623..a126ccd08 100644 --- a/general_tests/tutorial2_it_test.go +++ b/general_tests/tutorial2_it_test.go @@ -108,10 +108,7 @@ func testTutStopEngine(t *testing.T) { } func testTutRpcConn(t *testing.T) { - var err error - if tutRpc, err = engine.NewRPCClient(tutCfg.ListenCfg()); err != nil { - t.Fatal("could not connect to rater: ", err.Error()) - } + tutRpc = engine.NewRPCClient(t, tutCfg.ListenCfg()) } func testTutFromFolder(t *testing.T) { diff --git a/general_tests/tutorial_it_test.go b/general_tests/tutorial_it_test.go index 454cddee2..e1c540e1f 100644 --- a/general_tests/tutorial_it_test.go +++ b/general_tests/tutorial_it_test.go @@ -113,11 +113,7 @@ func testTutorialStartEngine(t *testing.T) { } func testTutorialRpcConn(t *testing.T) { - var err error - tutorialRpc, err = engine.NewRPCClient(tutorialCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed - if err != nil { - t.Fatal("Could not connect to rater: ", err.Error()) - } + tutorialRpc = engine.NewRPCClient(t, tutorialCfg.ListenCfg()) } func testTutorialFromFolder(t *testing.T) { diff --git a/general_tests/twoengines_it_test.go b/general_tests/twoengines_it_test.go index 023f04259..185887950 100644 --- a/general_tests/twoengines_it_test.go +++ b/general_tests/twoengines_it_test.go @@ -97,15 +97,8 @@ func testTwoEnginesStartEngine(t *testing.T) { } func testTwoEnginesRPC(t *testing.T) { - var err error - engineOneRpc, err = engine.NewRPCClient(engineOneCfg.ListenCfg()) - if err != nil { - t.Fatal(err) - } - engineTwoRpc, err = engine.NewRPCClient(engineTwoCfg.ListenCfg()) - if err != nil { - t.Fatal(err) - } + engineOneRpc = engine.NewRPCClient(t, engineOneCfg.ListenCfg()) + engineTwoRpc = engine.NewRPCClient(t, engineTwoCfg.ListenCfg()) } func testTwoEnginesCheckCacheBeforeSet(t *testing.T) {