[Asterisk-code-review] cdr/cdr dial subroutines: Add a check for a parallel dial in... (testsuite[master])

[Matt Jordan]

Matt Jordan has submitted this change and it was merged.

Change subject: cdr/cdr_dial_subroutines: Add a check for a parallel dial in a subroutine
......................................................................


cdr/cdr_dial_subroutines: Add a check for a parallel dial in a subroutine

This patch updates the cdr_dial_subroutines test to also cover a
parallel dial initiated from a subroutine. From a Macro, we now perform
a parallel dial of two Local channels. The first Local channel proceeds
as it previously did, with a one second Wait to help ensure ordering of
the CDR records as they are dispatched. The second Local channel hits a
Busy and hangs up. This covers the bug exposed noted in ASTERISK-24443.

ASTERISK-24443

Change-Id: Ib918fa0d0906f895dfaa4deff64535482bbe183f
---
M tests/cdr/cdr_dial_subroutines/configs/ast1/extensions.conf
M tests/cdr/cdr_dial_subroutines/test-config.yaml
2 files changed, 20 insertions(+), 2 deletions(-)

Approvals:
  Matt Jordan: Looks good to me, approved; Verified
  Joshua Colp: Looks good to me, but someone else must approve



diff --git a/tests/cdr/cdr_dial_subroutines/configs/ast1/extensions.conf b/tests/cdr/cdr_dial_subroutines/configs/ast1/extensions.conf
index 6787178..6302506 100644
--- a/tests/cdr/cdr_dial_subroutines/configs/ast1/extensions.conf
+++ b/tests/cdr/cdr_dial_subroutines/configs/ast1/extensions.conf
@@ -17,7 +17,13 @@
 
 ; Use a subroutine => macro => subroutine to dial 5000
 exten => 4000,1,NoOp()
+ same => n,Wait(1)
  same => n,GoSub(subroutines,dialer_4000,1)
+ same => n,Hangup()
+
+; Called from the macro that dials 4000 as well
+exten => 4001,1,NoOp()
+ same => n,Busy()
  same => n,Hangup()
 
 ; Answer this silly chain
@@ -42,8 +48,9 @@
 
 [macro-dialer_3000]
 
+; Perform a parallel dial to 4000
 exten => s,1,NoOp()
- same => n,Dial(Local/4000 at default/n)
+ same => n,Dial(Local/4000 at default/n&Local/4001 at default/n)
 
 [macro-dialer_4000]
 
diff --git a/tests/cdr/cdr_dial_subroutines/test-config.yaml b/tests/cdr/cdr_dial_subroutines/test-config.yaml
index 1bbd209..5363986 100644
--- a/tests/cdr/cdr_dial_subroutines/test-config.yaml
+++ b/tests/cdr/cdr_dial_subroutines/test-config.yaml
@@ -56,10 +56,21 @@
                 channel: 'Local/3000 at default-.*'
                 dchannel: 'Local/4000 at default-.*'
                 lastapp: 'Dial'
-                lastarg: 'Local/4000 at default/n'
+                lastarg: 'Local/4000 at default/n&Local/4001 at default/n'
                 disposition: 'ANSWERED'
                 amaflags: 'DOCUMENTATION'
             -
+            # 3000 at default -> 4001 at default (busy)
+                destination: '3000'
+                dcontext: 'default'
+                callerid: '"" <>'
+                channel: 'Local/3000 at default-.*'
+                dchannel: 'Local/4001 at default-.*'
+                lastapp: 'Dial'
+                lastarg: 'Local/4000 at default/n&Local/4001 at default/n'
+                disposition: 'BUSY'
+                amaflags: 'DOCUMENTATION'
+            -
             # 2000 at default -> 3000 at default
                 destination: '2000'
                 dcontext: 'default'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib918fa0d0906f895dfaa4deff64535482bbe183f
Gerrit-PatchSet: 1
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Matt Jordan <mjordan at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Matt Jordan <mjordan at digium.com>