From 8d1be0096243c97d620874c611f0b03c32b9d347 Mon Sep 17 00:00:00 2001 From: DanB Date: Fri, 1 Aug 2014 17:30:22 +0200 Subject: [PATCH] Fixes local_tests --- apier/apier_local_test.go | 2 +- data/conf/samples/apier_local_test.cfg | 2 ++ data/conf/samples/mediator_test1.cfg | 1 + .../fs_csv/cgrates/tariffplans/ActionTriggers.csv | 8 ++++---- .../fs_json/cgrates/tariffplans/ActionTriggers.csv | 8 ++++---- engine/mediator_local_test.go | 1 + 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/apier/apier_local_test.go b/apier/apier_local_test.go index a469f9ef7..0b9c99b6c 100644 --- a/apier/apier_local_test.go +++ b/apier/apier_local_test.go @@ -1277,7 +1277,7 @@ func TestResetDataAfterLoadFromFolder(t *testing.T) { t.Error("Calling ApierV1.ReloadCache got reply: ", reply) } var rcvStats *utils.CacheStats - expectedStats := &utils.CacheStats{Destinations: 4, RatingPlans: 3, RatingProfiles: 3, Actions: 3, DerivedChargers: 2} + expectedStats := &utils.CacheStats{Destinations: 4, RatingPlans: 3, RatingProfiles: 3, Actions: 4, DerivedChargers: 2} var args utils.AttrCacheStats if err := rater.Call("ApierV1.GetCacheStats", args, &rcvStats); err != nil { t.Error("Got error on ApierV1.GetCacheStats: ", err.Error()) diff --git a/data/conf/samples/apier_local_test.cfg b/data/conf/samples/apier_local_test.cfg index ae766cd99..05f08a2de 100644 --- a/data/conf/samples/apier_local_test.cfg +++ b/data/conf/samples/apier_local_test.cfg @@ -26,5 +26,7 @@ cdr_out_dir =/tmp/cgrates/cdr/cdrc/out # Absolute path towards the directory wh [mediator] enabled = true # Starts Mediator service: . rater = internal # Address where to reach the Rater: +cdrstats= + diff --git a/data/conf/samples/mediator_test1.cfg b/data/conf/samples/mediator_test1.cfg index ef7266402..e35edb524 100644 --- a/data/conf/samples/mediator_test1.cfg +++ b/data/conf/samples/mediator_test1.cfg @@ -19,6 +19,7 @@ export_dir = /tmp/cgrates/cdr/cdrexport/csv # Path where the exported CDRs will [mediator] enabled = true # Starts Mediator service: . rater = internal # Address where to reach the Rater: +cdrstats = [derived_charging] run_ids = run2 # Identifiers of additional sessions control. diff --git a/data/tutorials/fs_csv/cgrates/tariffplans/ActionTriggers.csv b/data/tutorials/fs_csv/cgrates/tariffplans/ActionTriggers.csv index d222d7ef8..d0b4b9023 100644 --- a/data/tutorials/fs_csv/cgrates/tariffplans/ActionTriggers.csv +++ b/data/tutorials/fs_csv/cgrates/tariffplans/ActionTriggers.csv @@ -1,4 +1,4 @@ -#Tag,BalanceType,Direction,ThresholdType,ThresholdValue,Recurrent,DestinationTag,ActionsTag,Weight -STANDARD_TRIGGERS,*monetary,*out,*min_balance,2,false,,LOG_WARNING,10 -STANDARD_TRIGGERS,*monetary,*out,*max_balance,20,false,,LOG_WARNING,10 -STANDARD_TRIGGERS,*monetary,*out,*max_counter,5,false,FS_USERS,LOG_WARNING,10 +#Tag,BalanceTag,Direction,ThresholdType,ThresholdValue,Recurrent,MinSleep,BalanceDestinationTag,BalanceWeight,BalanceExpiryTime,BalanceRatingSubject,BalanceSharedGroup,StatsMinQueuedItems,ActionsTag,Weight +STANDARD_TRIGGERS,*monetary,*out,*min_balance,2,false,0,,,,,,,LOG_WARNING,10 +STANDARD_TRIGGERS,*monetary,*out,*max_balance,20,false,0,,,,,,,LOG_WARNING,10 +STANDARD_TRIGGERS,*monetary,*out,*max_counter,5,false,0,FS_USERS,,,,,,LOG_WARNING,10 diff --git a/data/tutorials/fs_json/cgrates/tariffplans/ActionTriggers.csv b/data/tutorials/fs_json/cgrates/tariffplans/ActionTriggers.csv index e35423b69..f60064b22 100644 --- a/data/tutorials/fs_json/cgrates/tariffplans/ActionTriggers.csv +++ b/data/tutorials/fs_json/cgrates/tariffplans/ActionTriggers.csv @@ -1,4 +1,4 @@ -#Tag,BalanceType,Direction,ThresholdType,ThresholdValue,Recurrent,DestinationTag,ActionsTag,Weight -STANDARD_TRIGGERS,*monetary,*out,*min_balance,2,false,,LOG_WARNING,10 -STANDARD_TRIGGERS,*monetary,*out,*max_balance,20,false,,LOG_WARNING,10 -STANDARD_TRIGGERS,*monetary,*out,*max_counter,5,false,FS_USERS,LOG_WARNING,10 \ No newline at end of file +#Tag,BalanceTag,Direction,ThresholdType,ThresholdValue,Recurrent,MinSleep,BalanceDestinationTag,BalanceWeight,BalanceExpiryTime,BalanceRatingSubject,BalanceSharedGroup,StatsMinQueuedItems,ActionsTag,Weight +STANDARD_TRIGGERS,*monetary,*out,*min_balance,2,false,0,,,,,,,LOG_WARNING,10 +STANDARD_TRIGGERS,*monetary,*out,*max_balance,20,false,0,,,,,,,LOG_WARNING,10 +STANDARD_TRIGGERS,*monetary,*out,*max_counter,5,false,0,FS_USERS,,,,,,LOG_WARNING,10 \ No newline at end of file diff --git a/engine/mediator_local_test.go b/engine/mediator_local_test.go index 05fcf0405..c19107453 100644 --- a/engine/mediator_local_test.go +++ b/engine/mediator_local_test.go @@ -115,6 +115,7 @@ func TestStartEngine(t *testing.T) { if err := engine.Start(); err != nil { t.Fatal("Cannot start cgr-engine: ", err.Error()) } + time.Sleep(time.Duration(*startDelay) * time.Millisecond) // Give time to rater to fire up httpClient = new(http.Client) }