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

Revise NewRPCClient helper function

Browse Source
This commit is contained in:
ionutboangiu
2024-10-14 13:16:16 +03:00
committed by Dan Christian Bogos
parent 89dfc3e3d0
commit d4e4facc6b
56 changed files with 80 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
engine/libtest.go
View File

@@ -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 {

6
engine/z_actions2_it_test.go
View File

@@ -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) {

7
engine/z_actions_it_test.go
View File

@@ -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) {