From 77c571f7d6ccf471e126e7a4fa5f30b9b49af59e Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon@itsyscom.com>
Date: Fri, 22 May 2020 10:35:09 +0300
Subject: [PATCH] Updated call tests for asterisk

---
 agents/astagent.go                   | 10 +++-------
 general_tests/tutorial_calls_test.go |  8 +++++++-
 services/asteriskagent.go            |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/agents/astagent.go b/agents/astagent.go
index 46da18f39..22c74266e 100644
--- a/agents/astagent.go
+++ b/agents/astagent.go
@@ -85,16 +85,13 @@ func (sma *AsteriskAgent) connectAsterisk() (err error) {
 		connCfg.Address, connCfg.User, connCfg.Password, CGRAuthAPP), "http://cgrates.org",
 		connCfg.User, connCfg.Password, fmt.Sprintf("%s@%s", utils.CGRateS, utils.VERSION),
 		sma.astEvChan, sma.astErrChan, connCfg.ConnectAttempts, connCfg.Reconnects)
-	if err != nil {
-		return err
-	}
-	return nil
+	return
 }
 
 // ListenAndServe is called to start the service
 func (sma *AsteriskAgent) ListenAndServe() (err error) {
-	if err := sma.connectAsterisk(); err != nil {
-		return err
+	if err = sma.connectAsterisk(); err != nil {
+		return
 	}
 	for {
 		select {
@@ -159,7 +156,6 @@ func (sma *AsteriskAgent) handleStasisStart(ev *SMAsteriskEvent) {
 			fmt.Sprintf("<%s> error: %s subscribing for channelID: %s",
 				utils.AsteriskAgent, err.Error(), ev.ChannelID()))
 		return
-
 	}
 	//authorize Session
 	authArgs := ev.V1AuthorizeArgs()
diff --git a/general_tests/tutorial_calls_test.go b/general_tests/tutorial_calls_test.go
index 18c513ca9..6a11e7379 100755
--- a/general_tests/tutorial_calls_test.go
+++ b/general_tests/tutorial_calls_test.go
@@ -27,6 +27,7 @@ import (
 	"os"
 	"path"
 	"reflect"
+	"sort"
 	"strings"
 	"testing"
 	"time"
@@ -364,7 +365,7 @@ func testCallStartPjsuaListener(t *testing.T) {
 		acnts, 5070, time.Duration(*waitRater)*time.Millisecond); err != nil {
 		t.Fatal(err)
 	}
-	time.Sleep(1 * time.Second)
+	time.Sleep(3 * time.Second)
 }
 
 // Call from 1001 (prepaid) to 1002
@@ -395,6 +396,11 @@ func testCallGetActiveSessions(t *testing.T) {
 		nil, &reply); err != nil {
 		t.Error("Got error on SessionSv1.GetActiveSessions: ", err.Error())
 	} else {
+		if len(*reply) == 2 {
+			sort.Slice(*reply, func(i, j int) bool {
+				return strings.Compare((*reply)[i].RequestType, (*reply)[j].RequestType) > 0
+			})
+		}
 		// compare some fields (eg. CGRId is generated)
 		if !reflect.DeepEqual((*expected)[0].RequestType, (*reply)[0].RequestType) {
 			t.Errorf("Expected: %s, received: %s", (*expected)[0].RequestType, (*reply)[0].RequestType)
diff --git a/services/asteriskagent.go b/services/asteriskagent.go
index 3479e1f03..3a97df469 100644
--- a/services/asteriskagent.go
+++ b/services/asteriskagent.go
@@ -60,7 +60,7 @@ func (ast *AsteriskAgent) Start() (err error) {
 	defer ast.Unlock()
 
 	listenAndServe := func(sma *agents.AsteriskAgent, exitChan chan bool) {
-		if err = sma.ListenAndServe(); err != nil {
+		if err := sma.ListenAndServe(); err != nil {
 			utils.Logger.Err(fmt.Sprintf("<%s> runtime error: %s!", utils.AsteriskAgent, err))
 		}
 		exitChan <- true