From c653f32beb2d609943110e6d8c52432e5bc6fb1e Mon Sep 17 00:00:00 2001 From: TeoV Date: Thu, 18 Apr 2019 13:35:23 +0300 Subject: [PATCH] Resolve merge problems --- cmd/cgr-engine/cgr-engine.go | 1 - general_tests/cdrs_it_test.go | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go index 2e2bb2317..5ccc0335d 100644 --- a/cmd/cgr-engine/cgr-engine.go +++ b/cmd/cgr-engine/cgr-engine.go @@ -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) } diff --git a/general_tests/cdrs_it_test.go b/general_tests/cdrs_it_test.go index af265eb3c..a00f6b8e2 100644 --- a/general_tests/cdrs_it_test.go +++ b/general_tests/cdrs_it_test.go @@ -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)