diff --git a/general_tests/cdrs_exp_it_test.go b/general_tests/cdrs_exp_it_test.go index b1c7e7885..094cf455b 100644 --- a/general_tests/cdrs_exp_it_test.go +++ b/general_tests/cdrs_exp_it_test.go @@ -1,4 +1,4 @@ -// +build integration +// +build nodocker /* Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments @@ -330,6 +330,32 @@ func testCDRsExpKafka(t *testing.T) { cancel() } +func checkContent(ev *engine.ExportEvents, content []interface{}) error { + match := false + for _, bev := range ev.Events { + for _, con := range content { + if reflect.DeepEqual(bev, con) { + match = true + break + } + } + if match { + break + } + } + if !match { + exp := make([]string, len(content)) + for i, con := range content { + exp[i] = utils.IfaceAsString(con) + } + recv := make([]string, len(ev.Events)) + for i, con := range ev.Events { + recv[i] = utils.IfaceAsString(con) + } + return fmt.Errorf("Expecting: one of %s, received: %s", utils.ToJSON(exp), utils.ToJSON(recv)) + } + return nil +} func testCDRsExpFileFailover(t *testing.T) { time.Sleep(time.Second) filesInDir, _ := ioutil.ReadDir(cdrsExpCfg.GeneralCfg().FailedPostsDir) diff --git a/general_tests/cdrs_onlexp_it_test.go b/general_tests/cdrs_onlexp_it_test.go index 27f62e2f3..1384bdd39 100644 --- a/general_tests/cdrs_onlexp_it_test.go +++ b/general_tests/cdrs_onlexp_it_test.go @@ -1,4 +1,4 @@ -// +build integration +// +build nodocker /* Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments @@ -445,33 +445,6 @@ func testCDRsOnExpAMQPReplication(t *testing.T) { } -func checkContent(ev *engine.ExportEvents, content []interface{}) error { - match := false - for _, bev := range ev.Events { - for _, con := range content { - if reflect.DeepEqual(bev, con) { - match = true - break - } - } - if match { - break - } - } - if !match { - exp := make([]string, len(content)) - for i, con := range content { - exp[i] = utils.IfaceAsString(con) - } - recv := make([]string, len(ev.Events)) - for i, con := range ev.Events { - recv[i] = utils.IfaceAsString(con) - } - return fmt.Errorf("Expecting: one of %s, received: %s", utils.ToJSON(exp), utils.ToJSON(recv)) - } - return nil -} - func testCDRsOnExpFileFailover(t *testing.T) { v1 := url.Values{} v2 := url.Values{}