[Asterisk-code-review] bridge: Fix connected line update test sporadic failure on 1... (testsuite[master])

[Joshua Colp]

Joshua Colp has uploaded a new change for review.

  https://gerrit.asterisk.org/1302

Change subject: bridge: Fix connected_line_update test sporadic failure on 13 and above.
......................................................................

bridge: Fix connected_line_update test sporadic failure on 13 and above.

The connected_line_update test originally expected 3 repeated connected
line updates with the same value. In 13 and above this can sometimes
not occur as the connected line update may be handled before the
second channel has entered the bridge. Only 2 connected line updates
may occur instead.

This change removes the ordered header matching for these connected
line updates since one may or may not occur. In its place are individual
header matches to ensure that the minimum number of connected line
updates occur.

ASTERISK-25313 #close

Change-Id: I23287f3508e42d8866144de9797f9742f3696cf5
---
M tests/bridge/connected_line_update/test-config.yaml
1 file changed, 30 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/02/1302/1

diff --git a/tests/bridge/connected_line_update/test-config.yaml b/tests/bridge/connected_line_update/test-config.yaml
index 8171368..6320281 100644
--- a/tests/bridge/connected_line_update/test-config.yaml
+++ b/tests/bridge/connected_line_update/test-config.yaml
@@ -24,29 +24,32 @@
 
 ami-uut:
     -
-        type: 'orderedheadermatch'
+        type: 'headermatch'
         id: '0'
         conditions:
             match:
                 Event: 'UserEvent'
                 UserEvent: 'CLInfo'
-        requirements:
-            -
-                match:
-                    CLInfo: 'Bob <4321>'
-            -
-                match:
-                    CLInfo: 'Bob <4321>'
-            -
-                match:
-                    CLInfo: 'Bob <4321>'
-            -
-                match:
-                    CLInfo: 'newbob <2345>'
-            -
-                match:
-                    CLInfo: 'newalice <5432>'
-        count: '5'
+                CLInfo: 'Bob <4321>'
+        count: '>1'
+    -
+        type: 'headermatch'
+        id: '0'
+        conditions:
+            match:
+                Event: 'UserEvent'
+                UserEvent: 'CLInfo'
+                CLInfo: 'newbob <2345>'
+        count: '1'
+    -
+        type: 'headermatch'
+        id: '0'
+        conditions:
+            match:
+                Event: 'UserEvent'
+                UserEvent: 'CLInfo'
+                CLInfo: 'newalice <5432>'
+        count: '1'
     -
         type: 'headermatch'
         id: '1'
@@ -65,6 +68,15 @@
                 CallerIDName: 'newbob'
                 CallerIDNum: '2345'
         count: '1'
+    -
+        type: 'headermatch'
+        id: '2'
+        conditions:
+            match:
+                Event: 'NewCallerid'
+                CallerIDName: 'Bob'
+                CallerIDNum: '4321'
+        count: '0'
 
 
 properties:

-- 
To view, visit https://gerrit.asterisk.org/1302
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I23287f3508e42d8866144de9797f9742f3696cf5
Gerrit-PatchSet: 1
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Joshua Colp <jcolp at digium.com>