uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-14 12:49:54 +05:00
Code Issues Packages Projects Releases Wiki Activity

tests end session after no credit

Browse Source
This commit is contained in:
Radu Ioan Fericean
2016-03-31 20:25:51 +03:00
parent ccb5c1c503
commit e6eb2439f1
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/tariffplans/testtp/DerivedChargers.csv
View File

@@ -3,4 +3,4 @@
*out,cgrates.org,call,dan,dan,,extra2,,,,,,^ivo,^ivo,,,,,,*default,*default,*default,*default
*out,cgrates.org,call,dan,dan,,extra3,~filterhdr1:s/(.+)/special_run3/,,,,,^runusr3,^runusr3,,,,,,*default,*default,*default,*default
*out,cgrates.org,call,dan,*any,,extra1,,,,,,^rif2,^rif2,,,,,,*default,*default,*default,*default
*out,cgrates.org,call,1011,1011,GERMANY,extra1,,,+4915,,,,,,,,,,*default,*default,*default,*default
*out,cgrates.org,call,1011,1011,GERMANY,extra1,,,,,,,,^+4915,,,,,*default,*default,*default,*default
1 #Direction[0] Tenant[1] Category[2] Account[3] Subject[4] DestinationIds[5] RunId[6] RunFilter[7] ReqTypeField[8] DirectionField[9] TenantField[10] CategoryField[11] AccountField[12] SubjectField[13] DestinationField[14] SetupTimeField[15] PddField[16] AnswerTimeField[17] UsageField[18] SupplierField[19] DisconnectCause[20] RatedField[21] CostField[22]
3 *out cgrates.org call dan dan extra2 ^ivo ^ivo *default *default *default *default
4 *out cgrates.org call dan dan extra3 ~filterhdr1:s/(.+)/special_run3/ ^runusr3 ^runusr3 *default *default *default *default
5 *out cgrates.org call dan *any extra1 ^rif2 ^rif2 *default *default *default *default
6 *out cgrates.org call 1011 1011 GERMANY extra1 +4915 ^+4915 *default *default *default *default

10
sessionmanager/data_it_test.go
View File

@@ -349,10 +349,10 @@ func TestSMGDataDerivedChargingNoCredit(t *testing.T) {
}
var acnt *engine.Account
attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1011"}
eAcntVal := 50000.000000
eAcntVal := 50000.0
if err := smgRPC.Call("ApierV2.GetAccount", attrs, &acnt); err != nil {
t.Error(err)
} else if acnt.BalanceMap[utils.DATA].GetTotalValue() != eAcntVal {
} else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eAcntVal {
t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.VOICE].GetTotalValue())
}
smgEv := SMGenericEvent{
@@ -374,13 +374,13 @@ func TestSMGDataDerivedChargingNoCredit(t *testing.T) {
if err := smgRPC.Call("SMGenericV1.SessionStart", smgEv, &maxUsage); err != nil {
t.Error(err)
}
if maxUsage != 100 {
if maxUsage != 0 {
t.Error("Bad max usage: ", maxUsage)
}
eAcntVal = 50000.000000
eAcntVal = 50000.0
if err := smgRPC.Call("ApierV2.GetAccount", attrs, &acnt); err != nil {
t.Error(err)
} else if acnt.BalanceMap[utils.DATA].GetTotalValue() != eAcntVal {
} else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eAcntVal {
t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.VOICE].GetTotalValue())
}
}

2
sessionmanager/smgeneric.go
View File

@@ -245,7 +245,7 @@ func (self *SMGeneric) SessionStart(gev SMGenericEvent, clnt *rpc2.Client) (time
return nilDuration, err
}
d, err := self.SessionUpdate(gev, clnt)
if err != nil {
if err != nil || d == 0 {
self.sessionEnd(gev.GetUUID(), 0)
}
return d, err