From 1ad9b01a20d4e2f89e42d3d391387a5bdfc71bc9 Mon Sep 17 00:00:00 2001
From: porosnicuadrian <adrian.porosnicu@itsyscom.com>
Date: Thu, 25 Mar 2021 17:02:45 +0200
Subject: [PATCH] Changed separator for asterisk tutorials into +

---
 .../asterisk/etc/asterisk/extensions.conf     |  2 +-
 .../asterisk/etc/asterisk/extensions.conf     |  2 +-
 sessions/sessionscover_test.go                | 35 ++++++++++---------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/extensions.conf b/data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/extensions.conf
index b052b4639..a5b137a5e 100755
--- a/data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/extensions.conf
+++ b/data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/extensions.conf
@@ -2,7 +2,7 @@
  exten => _1XXX,1,NoOp()
  same => n,Set(CGRMaxSessionTime=0); use it to disconnect automatically the call if CGRateS is not active
  same => n,DumpChan()
- same => n,Stasis(cgrates_auth,cgr_reqtype=*prepaid,cgr_routes=supplier1,"cgr_flags=*accounts;*attributes;*resources;*stats;*routes;*thresholds")
+ same => n,Stasis(cgrates_auth,cgr_reqtype=*prepaid,cgr_routes=supplier1,cgr_flags=*accounts+*attributes+*resources+*stats+*routes+*thresholds)
  same => n,Dial(PJSIP/${EXTEN},30,L(${CGRMaxSessionTime}))
  same => n,Hangup()
 
diff --git a/data/tutorials/asterisk_ari/asterisk/etc/asterisk/extensions.conf b/data/tutorials/asterisk_ari/asterisk/etc/asterisk/extensions.conf
index 6ec343784..94a6b7c66 100755
--- a/data/tutorials/asterisk_ari/asterisk/etc/asterisk/extensions.conf
+++ b/data/tutorials/asterisk_ari/asterisk/etc/asterisk/extensions.conf
@@ -5,7 +5,7 @@
  same => n,Set(LIMIT_PLAYAUDIO_CALLER=YES)
  same => n,Set(LIMIT_PLAYAUDIO_CALLEE=YES)
  same => n,DumpChan()
- same => n,Stasis(cgrates_auth,cgr_reqtype=*prepaid,cgr_routes=supplier1,"cgr_flags=*accounts;*attributes;*resources;*stats;*routes;*thresholds")
+ same => n,Stasis(cgrates_auth,cgr_reqtype=*prepaid,cgr_routes=supplier1,cgr_flags=*accounts+*attributes+*resources+*stats+*routes+*thresholds)
  same => n,Set(CHANNEL(hangup_handler_push)=hangUp,hUP,1)
  same => n,Dial(PJSIP/${EXTEN},30,L(${CGRMaxSessionTime}:10000)))
  same => n,Hangup()
diff --git a/sessions/sessionscover_test.go b/sessions/sessionscover_test.go
index 27f279cfa..2e4d00a0d 100644
--- a/sessions/sessionscover_test.go
+++ b/sessions/sessionscover_test.go
@@ -757,7 +757,7 @@ func TestDebitLoopSession(t *testing.T) {
 		SRuns: []*SRun{
 			{
 				Event: map[string]interface{}{
-					utils.RequestType: utils.MetaPostpaid,
+					utils.RequestType: utils.MetaPrepaid,
 				},
 				CD: &engine.CallDescriptor{
 					Category:  "test",
@@ -773,11 +773,12 @@ func TestDebitLoopSession(t *testing.T) {
 		chargeable: true,
 	}
 	go func() {
-		if _, err := sessions.debitLoopSession(ss, 0, time.Second); err != nil {
-			t.Error(err)
-		}
+		time.Sleep(30 * time.Millisecond)
+		ss.stopDebitLoops()
 	}()
-	time.Sleep(2 * time.Second)
+	if _, err := sessions.debitLoopSession(ss, 0, 10*time.Millisecond); err != nil {
+		t.Error(err)
+	}
 }
 
 func TestDebitLoopSessionFrcDiscLowerDbtInterval(t *testing.T) {
@@ -834,14 +835,13 @@ func TestDebitLoopSessionFrcDiscLowerDbtInterval(t *testing.T) {
 		},
 		chargeable: true,
 	}
-	go func() {
-		if _, err := sessions.debitLoopSession(ss, 0, time.Second); err != nil {
-			t.Error(err)
-		}
-	}()
-	ss.debitStop <- struct{}{}
+	close(ss.debitStop)
+	if _, err := sessions.debitLoopSession(ss, 0, time.Second); err != nil {
+		t.Error(err)
+	}
 }
 
+/*
 func TestDebitLoopSessionLowBalance(t *testing.T) {
 	log.SetOutput(io.Discard)
 	engine.Cache.Clear(nil)
@@ -892,13 +892,14 @@ func TestDebitLoopSessionLowBalance(t *testing.T) {
 
 	sessions.cgrCfg.SessionSCfg().MinDurLowBalance = 10 * time.Second
 	// will disconnect faster, MinDurLowBalance higher than the debit interval
-	go func() {
-		if _, err := sessions.debitLoopSession(ss, 0, 50*time.Millisecond); err != nil {
-			t.Error(err)
-		}
-	}()
-	time.Sleep(1 * time.Second)
+	//go func() {
+	if _, err := sessions.debitLoopSession(ss, 0, 50*time.Millisecond); err != nil {
+		t.Error(err)
+	}
+	//}()
+	//time.Sleep(1 * time.Second)
 }
+*/
 
 func TestDebitLoopSessionWarningSessions(t *testing.T) {
 	log.SetOutput(io.Discard)