From c3feacac7d28bb79e2b7d6b40b956d0ea203d09c Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Tue, 29 Mar 2016 19:43:45 +0300 Subject: [PATCH] last usage test fixes --- sessionmanager/data_it_test.go | 6 +++--- sessionmanager/smg_session.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sessionmanager/data_it_test.go b/sessionmanager/data_it_test.go index 513941df0..b281c2985 100644 --- a/sessionmanager/data_it_test.go +++ b/sessionmanager/data_it_test.go @@ -258,7 +258,7 @@ func TestSMGDataLastUsedMultipleData(t *testing.T) { if maxUsage != 1.048576e+06 { t.Error("Bad max usage: ", maxUsage) } - eAcntVal = 49997849600.000000 // 20480 + eAcntVal = 49998883840.000000 // 20480 if err := smgRPC.Call("ApierV2.GetAccount", attrs, &acnt); err != nil { t.Error(err) } else if acnt.BalanceMap[utils.DATA].GetTotalValue() != eAcntVal { @@ -285,7 +285,7 @@ func TestSMGDataLastUsedMultipleData(t *testing.T) { if maxUsage != 1.048576e+06 { t.Error("Bad max usage: ", maxUsage) } - eAcntVal = 49997829120.000000 // 20480 + eAcntVal = 49998863360.000000 // 20480 if err := smgRPC.Call("ApierV2.GetAccount", attrs, &acnt); err != nil { t.Error(err) } else if acnt.BalanceMap[utils.DATA].GetTotalValue() != eAcntVal { @@ -311,7 +311,7 @@ func TestSMGDataLastUsedMultipleData(t *testing.T) { if maxUsage != 1.048576e+06 { t.Error("Bad max usage: ", maxUsage) } - eAcntVal = 49996774400.000000 // 1054720 + eAcntVal = 49998842880.000000 // 20480 if err := smgRPC.Call("ApierV2.GetAccount", attrs, &acnt); err != nil { t.Error(err) } else if acnt.BalanceMap[utils.DATA].GetTotalValue() != eAcntVal { diff --git a/sessionmanager/smg_session.go b/sessionmanager/smg_session.go index ba02dbb60..4f4c7ed28 100644 --- a/sessionmanager/smg_session.go +++ b/sessionmanager/smg_session.go @@ -96,6 +96,7 @@ func (self *SMGSession) debit(dur time.Duration, lastUsed time.Duration) (time.D return ccDuration, nil } //utils.Logger.Debug(fmt.Sprintf("dur: %f", dur.Seconds())) + initialExtraDuration := self.extraDuration self.extraDuration = 0 if self.cd.LoopIndex > 0 { self.cd.TimeStart = self.cd.TimeEnd @@ -111,7 +112,6 @@ func (self *SMGSession) debit(dur time.Duration, lastUsed time.Duration) (time.D self.cd.TimeEnd = cc.GetEndTime() // set debited timeEnd // update call duration with real debited duration ccDuration := cc.GetDuration() - initialExtraDuration := self.extraDuration if ccDuration != dur { self.extraDuration = ccDuration - dur }