[asterisk-dev] Change in testsuite[master]: non_stasis_bridge_to_stasis_bridge: Update regex for ami events

[Kevin Harwell (Code Review)]

Kevin Harwell has uploaded a new change for review.

  https://gerrit.asterisk.org/25

Change subject: non_stasis_bridge_to_stasis_bridge: Update regex for ami events
......................................................................

non_stasis_bridge_to_stasis_bridge: Update regex for ami events

Due to a bug in Asterisk, in some cases, the channel would not be hung up after
leaving the bridge upon completing an attended transfer. With that fixed this
test can now be expected to pass. However there were a few spots where the ami
event matching class had trouble matching events with a '-' included. Removed
the '-' to no longer be part of the search criteria. The test now works as
expected.

Change-Id: I0a3bcb1a0df7e7bdca02be827288f5f08b5140ce
---
M tests/rest_api/external_interaction/attended_transfer/non_stasis_bridge_to_stasis_bridge/test-config.yaml
1 file changed, 9 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/25/25/2

diff --git a/tests/rest_api/external_interaction/attended_transfer/non_stasis_bridge_to_stasis_bridge/test-config.yaml b/tests/rest_api/external_interaction/attended_transfer/non_stasis_bridge_to_stasis_bridge/test-config.yaml
index 97009bb..60611b6 100644
--- a/tests/rest_api/external_interaction/attended_transfer/non_stasis_bridge_to_stasis_bridge/test-config.yaml
+++ b/tests/rest_api/external_interaction/attended_transfer/non_stasis_bridge_to_stasis_bridge/test-config.yaml
@@ -273,6 +273,11 @@
                 channel:
                     name: 'Local/_attended at transfer-.*;2'
             count: 1
+        ami-actions:
+            action:
+               action: 'Hangup'
+               channel: '/^PJSIP/bob-.*$/'
+
     # Ensure alice's second channel exits the Stasis app. Then hang up bob.
     -
         ari-events:
@@ -282,10 +287,6 @@
                 channel:
                     name: 'PJSIP/alice-.*'
             count: 1
-        ami-actions:
-            action:
-               action: 'Hangup'
-               channel: '/^PJSIP/bob-.*$/'
     # Upon hanging up bob, ensure bob leaves the non-Stasis bridge and is hung
     # up.
     -
@@ -311,7 +312,7 @@
             conditions:
                 match:
                     Event: 'BridgeLeave'
-                    Channel: 'Local/_attended-.*;1'
+                    Channel: 'Local/_attended.*;1'
                 nomatch:
                     BridgeUniqueid: 'test_bridge'
             count: 1
@@ -320,7 +321,7 @@
             conditions:
                 match:
                     Event: 'Hangup'
-                    Channel: 'Local/_attended-.*;1'
+                    Channel: 'Local/_attended.*;1'
             count: 1
     # Ensure the local channel half in Stasis bridge with carol leaves the
     # bridge.
@@ -332,7 +333,7 @@
                 bridge:
                     id: 'test_bridge'
                 channel:
-                    name: 'Local/_attended-.*;2'
+                    name: 'Local/_attended.*;2'
             count: 1
     # Ensure the local channel half in Stasis bridge with carol exits the
     # Stasis app. Then hang up carol.
@@ -342,7 +343,7 @@
                 type: StasisEnd
                 application: 'testsuite'
                 channel:
-                    name: 'Local/_attended-.*;2'
+                    name: 'Local/_attended.*;2'
             count: 1
         ari-requests:
             method: 'delete'
@@ -393,6 +394,3 @@
     tags:
         - ARI
         - pjsip
-    # Expect test to fail until ASTERISK-24782 is resolved.
-    expected-result: False
-

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a3bcb1a0df7e7bdca02be827288f5f08b5140ce
Gerrit-PatchSet: 2
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Kevin Harwell <kharwell at digium.com>