From ba7e60c3fe3355533a9c74bd71bd642b951b24f2 Mon Sep 17 00:00:00 2001 From: DanB Date: Mon, 28 Nov 2016 18:35:51 +0100 Subject: [PATCH] PartialCDR integration test fix --- cdrc/partialcsv_it_test.go | 7 +++++-- data/conf/samples/cdrc_partcsv/cgrates.json | 2 +- engine/storage_redis_it_test.go | 3 --- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cdrc/partialcsv_it_test.go b/cdrc/partialcsv_it_test.go index 65bbc2c5c..81b12a63f 100644 --- a/cdrc/partialcsv_it_test.go +++ b/cdrc/partialcsv_it_test.go @@ -46,8 +46,8 @@ var partCsvFileContent1 = `4986517174963,004986517174964,DE-National,04.07.2016 var partCsvFileContent2 = `4986517174963,004986517174964,DE-National,04.07.2016 19:00:00,04.07.2016 18:58:55,0,15,Offpeak,0.003360,498651,partial` var partCsvFileContent3 = `4986517174964,004986517174960,DE-National,04.07.2016 19:05:55,04.07.2016 19:05:55,0,23,Offpeak,0.003360,498651,partial` -var eCacheDumpFile1 = `4986517174963_004986517174964_04.07.2016 18:58:55,1467651600,*rated,086517174963,+4986517174964,2016-07-04T18:58:55+02:00,2016-07-04T18:58:55+02:00,15,-1.00000 -4986517174963_004986517174964_04.07.2016 18:58:55,1467651535,*rated,086517174963,+4986517174964,2016-07-04T18:58:55+02:00,2016-07-04T18:58:55+02:00,65,-1.00000 +var eCacheDumpFile1 = `4986517174963_004986517174964_04.07.2016 18:58:55,1467651535,*rated,086517174963,+4986517174964,2016-07-04T18:58:55+02:00,2016-07-04T18:58:55+02:00,65,-1 +4986517174963_004986517174964_04.07.2016 18:58:55,1467651600,*rated,086517174963,+4986517174964,2016-07-04T18:58:55+02:00,2016-07-04T18:58:55+02:00,15,-1 ` func TestPartcsvITInitConfig(t *testing.T) { @@ -149,6 +149,9 @@ func TestPartcsvITProcessedFiles(t *testing.T) { t.Errorf("Expecting: %q, received: %q", partCsvFileContent2, string(outContent2)) } filesInDir, _ := ioutil.ReadDir(partcsvCDRCDirOut1) + if len(filesInDir) == 0 { + t.Errorf("No files found in folder: <%s>", partcsvCDRCDirOut1) + } var fileName string for _, file := range filesInDir { // First file in directory is the one we need, harder to find it's name out of config if strings.HasPrefix(file.Name(), "4986517174963_004986517174964") { diff --git a/data/conf/samples/cdrc_partcsv/cgrates.json b/data/conf/samples/cdrc_partcsv/cgrates.json index aaf1c8316..7fadf3380 100644 --- a/data/conf/samples/cdrc_partcsv/cgrates.json +++ b/data/conf/samples/cdrc_partcsv/cgrates.json @@ -20,7 +20,7 @@ "cdrc": [ { - "id": "*default", + "id": "part1", "enabled": true, "cdr_format": "partial_csv", "cdr_in_dir": "/tmp/cdrctests/partcsv1/in", // absolute path towards the directory where the CDRs are stored diff --git a/engine/storage_redis_it_test.go b/engine/storage_redis_it_test.go index fbeba9b2c..ee1d0bcc8 100644 --- a/engine/storage_redis_it_test.go +++ b/engine/storage_redis_it_test.go @@ -154,9 +154,6 @@ func TestRDSitMatchReqFilterIndex(t *testing.T) { } func TestRDSitCacheDataFromDB(t *testing.T) { - if !*testIntegration { - return - } dst := &Destination{Id: "TEST_CACHE", Prefixes: []string{"+491", "+492", "+493"}} if err := rds.SetDestination(dst, ""); err != nil { t.Error(err)