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

Resolve merge problems

Browse Source
This commit is contained in:
TeoV
2019-04-18 13:35:23 +03:00
parent 3075b70d0b
commit c653f32beb
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/cgr-engine/cgr-engine.go
View File

@@ -1673,7 +1673,6 @@ func main() {
engine.IntRPC.AddInternalRPCClient(utils.SupplierSv1, internalSupplierSChan)
engine.IntRPC.AddInternalRPCClient(utils.ThresholdSv1, internalThresholdSChan)
engine.IntRPC.AddInternalRPCClient(utils.ServiceManagerV1, internalServeManagerChan)
engine.IntRPC.AddInternalRPCClient(utils.ServManagerV1, internalServeManagerChan)
engine.IntRPC.AddInternalRPCClient(utils.ConfigSv1, internalConfigChan)
}

3
general_tests/cdrs_it_test.go
View File

@@ -598,7 +598,8 @@ func testV2CDRsGetStats1(t *testing.T) {
func testV2CDRsGetThreshold1(t *testing.T) {
expected := []string{"THD_ACNT_1001", "THD_PoccessCDR"}
var result []string
if err := cdrsRpc.Call("ApierV1.GetThresholdProfileIDs", "cgrates.org", &result); err != nil {
if err := cdrsRpc.Call("ApierV1.GetThresholdProfileIDs",
utils.TenantArgWithPaginator{TenantArg: utils.TenantArg{"cgrates.org"}}, &result); err != nil {
t.Error(err)
} else if len(expected) != len(result) {
t.Errorf("Expecting : %+v, received: %+v", expected, result)