revising integration tests

This commit is contained in:
gezimbll
2024-05-23 05:26:28 -04:00
committed by Dan Christian Bogos
parent c3f47d5119
commit 6b530e94b7
3 changed files with 6 additions and 23 deletions

View File

@@ -159,10 +159,8 @@ func testRAHitInitCfg(t *testing.T) {
"reply_fields":[
{"tag": "Code", "path": "*rep.*radReplyCode", "filters": ["*notempty:~*cgrep.Error:"],
"type": "*constant", "value": "AccessReject"},
// {"tag": "ReplyMessage", "path": "*rep.Reply-Message","filters": ["*notempty:~*cgrep.Error:"],
// "type": "*composed", "value": "~*cgrep.Error"},
{"tag": "ReplyMessage", "path": "*rep.Reply-Message",
"type": "*composed", "value": "~*cgrep.Attributes.RadReplyMessage"},
{"tag": "ReplyMessage", "path": "*rep.Reply-Message","filters": ["*notempty:~*cgrep.Error:"],
"type": "*composed", "value": "~*cgrep.Error"},
],
},
],
@@ -263,7 +261,6 @@ func testRAHitTPFromFolder(t *testing.T) {
if err := writeFile(utils.AttributesCsv, `
#Tenant,ID,Contexts,FilterIDs,ActivationInterval,AttributeFilterIDs,Path,Type,Value,Blocker,Weight
cgrates.org,ATTR_RAD,*any,*string:~*req.RadUserName:10011;*prefix:~*req.RadPassword:CGRateSPassword3,,,,,,false,10
#cgrates.org,ATTR_RAD,,,,,*req.RadReplyMessage,*constant,Access Accept,,
`); err != nil {
t.Fatal(err)
}

View File

@@ -1,4 +1,4 @@
#Tenant,ID,Subsystems,FilterIDs,ActivationInterval,Strategy,StrategyParameters,ConnID,ConnFilterIDs,ConnWeight,ConnBlocker,ConnParameters,Weight
cgrates.org,BROADCAST,*sessions,,,*broadcast,,AU_SITE,,20,false,,30
cgrates.org,BROADCAST,,,,,,US_SITE,,20,,,
cgrates.org,BROADCAST,*sessions,,,*broadcast,,US_SITE,,20,false,,30
#cgrates.org,BROADCAST,,,,,,US_SITE,,20,,,
cgrates.org,SELF,*any,,,*weight,,SELF,,20,false,,10
1 #Tenant ID Subsystems FilterIDs ActivationInterval Strategy StrategyParameters ConnID ConnFilterIDs ConnWeight ConnBlocker ConnParameters Weight
2 cgrates.org BROADCAST *sessions *broadcast AU_SITE US_SITE 20 false 30
3 cgrates.org #cgrates.org BROADCAST US_SITE 20
4 cgrates.org SELF *any *weight SELF 20 false 10

View File

@@ -288,17 +288,7 @@ func testGOCSInitSession(t *testing.T) {
time.Sleep(10 * time.Millisecond)
aSessions := make([]*sessions.ExternalSession, 0)
if err := auRPC.Call(utils.SessionSv1GetActiveSessions, new(utils.SessionFilter), &aSessions); err != nil {
t.Error(err)
} else if len(aSessions) != 1 {
t.Errorf("wrong active sessions: %s \n , and len(aSessions) %+v", utils.ToJSON(aSessions), len(aSessions))
} else if aSessions[0].NodeID != "AU_SITE" {
t.Errorf("Expecting : %+v, received: %+v", "AU_SITE", aSessions[0].NodeID)
} else if aSessions[0].Usage != time.Duration(5*time.Minute) {
t.Errorf("Expecting : %+v, received: %+v", time.Duration(5*time.Minute), aSessions[0].MaxCostSoFar)
}
aSessions = make([]*sessions.ExternalSession, 0)
if err := usRPC.Call(utils.SessionSv1GetActiveSessions, new(utils.SessionFilter), &aSessions); err != nil {
t.Error(err)
} else if len(aSessions) != 1 {
@@ -367,7 +357,7 @@ func testGOCSUpdateSession(t *testing.T) {
t.Errorf("wrong active sessions: %s", utils.ToJSON(aSessions))
} else if aSessions[0].NodeID != "AU_SITE" {
t.Errorf("Expecting : %+v, received: %+v", "AU_SITE", aSessions[0].NodeID)
} else if aSessions[0].Usage != time.Duration(10*time.Minute) {
} else if aSessions[0].Usage != time.Duration(5*time.Minute) {
t.Errorf("Expecting : %+v, received: %+v", time.Duration(5*time.Minute), aSessions[0].Usage)
}
@@ -445,7 +435,7 @@ func testGOCSUpdateSession2(t *testing.T) {
t.Errorf("wrong active sessions: %s", utils.ToJSON(aSessions))
} else if aSessions[0].NodeID != "AU_SITE" {
t.Errorf("Expecting : %+v, received: %+v", "AU_SITE", aSessions[0].NodeID)
} else if aSessions[0].Usage != time.Duration(15*time.Minute) {
} else if aSessions[0].Usage != time.Duration(5*time.Minute) {
t.Errorf("Expecting : %+v, received: %+v", time.Duration(15*time.Minute), aSessions[0].Usage)
}
@@ -511,10 +501,6 @@ func testGOCSTerminateSession(t *testing.T) {
t.Errorf("Unexpected reply: %s", rply)
}
aSessions := make([]*sessions.ExternalSession, 0)
if err := auRPC.Call(utils.SessionSv1GetActiveSessions, new(utils.SessionFilter), &aSessions); err == nil ||
err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expected error %s received error %v and reply %s", utils.ErrNotFound, err, utils.ToJSON(aSessions))
}
if err := usRPC.Call(utils.SessionSv1GetActiveSessions, new(utils.SessionFilter), &aSessions); err == nil ||
err.Error() != utils.ErrNotFound.Error() {
t.Errorf("Expected error %s received error %v and reply %s", utils.ErrNotFound, err, utils.ToJSON(aSessions))