From a0c820031f64547f5bce372910472672965bb37e Mon Sep 17 00:00:00 2001 From: Trial97 Date: Wed, 27 Jan 2021 12:14:01 +0200 Subject: [PATCH] Updated integration tests --- ers/flatstore_it_test.go | 10 +++++----- ers/partial_csv.go | 4 ++++ .../session_replications_automaticdebit_it_test.go | 8 +++++--- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ers/flatstore_it_test.go b/ers/flatstore_it_test.go index 775085138..f12883c2b 100644 --- a/ers/flatstore_it_test.go +++ b/ers/flatstore_it_test.go @@ -175,11 +175,11 @@ func testFlatstoreITHandleCdr1File(t *testing.T) { t.Errorf("Files in ersInDir: %+v", filesInDir) } filesOutDir, _ := ioutil.ReadDir("/tmp/flatstoreErs/out") - ids := []string{} - for _, fD := range filesOutDir { - ids = append(ids, fD.Name()) - } - if len(filesOutDir) != 6 { + if len(filesOutDir) != 5 { + ids := []string{} + for _, fD := range filesOutDir { + ids = append(ids, fD.Name()) + } t.Errorf("Unexpected number of files in output directory: %+v, %q", len(filesOutDir), ids) } ePartContent := "INVITE|2daec40c|548625ac|dd0c4c617a9919d29a6175cdff223a9p@0:0:0:0:0:0:0:0|200|OK|1436454408|*prepaid|1001|1002||3401:2069362475\n" diff --git a/ers/partial_csv.go b/ers/partial_csv.go index f0eb40e8f..f7879dccd 100644 --- a/ers/partial_csv.go +++ b/ers/partial_csv.go @@ -265,6 +265,7 @@ func (rdr *PartialCSVFileER) processFile(fPath, fName string) (err error) { rdrCfg: rdr.Config(), } evsPosted++ + rdr.cache.Set(cgrID, nil, nil) rdr.cache.Remove(cgrID) } else { // overwrite the cache value with merged NavigableMap @@ -356,6 +357,9 @@ func (rdr *PartialCSVFileER) dumpToFile(itmID string, value interface{}) { } func (rdr *PartialCSVFileER) postCDR(itmID string, value interface{}) { + if value == nil { + return + } tmz := utils.FirstNonEmpty(rdr.Config().Timezone, rdr.cgrCfg.GeneralCfg().DefaultTimezone) origCgrEvs := value.([]*utils.CGREvent) diff --git a/general_tests/session_replications_automaticdebit_it_test.go b/general_tests/session_replications_automaticdebit_it_test.go index 15aecbe4f..9e043c807 100644 --- a/general_tests/session_replications_automaticdebit_it_test.go +++ b/general_tests/session_replications_automaticdebit_it_test.go @@ -340,11 +340,13 @@ func testSessionSRplCheckAccount(t *testing.T) { Account: "1005", } + expectedBal := 5*time.Second - 40*time.Millisecond if err := smgRplcSlvRPC.Call(utils.APIerSv2GetAccount, attrs, &acnt); err != nil { t.Error(err) - // a tolerance of +/- 5ms is acceptable - } else if rply := acnt.BalanceMap[utils.MetaVoice].GetTotalValue(); rply < float64(5*time.Second-46*time.Millisecond) || rply > float64(5*time.Second-35*time.Millisecond) { - t.Errorf("Expecting: ~%v, received: %v", float64(5*time.Second-40*time.Millisecond), rply) + // a tolerance of +/- 10ms is acceptable + } else if rply := acnt.BalanceMap[utils.MetaVoice].GetTotalValue(); rply < float64(expectedBal-10*time.Millisecond) || + rply > float64(expectedBal+10*time.Millisecond) { + t.Errorf("Expecting: ~%v, received: %v", expectedBal, time.Duration(rply)) } }