<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/testsuite/+/19789">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span></span><br></pre><div style="white-space:pre-wrap">Approvals:
N A: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, but someone else must approve
Benjamin Keith Ford: Looks good to me, approved
Friendly Automation: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">app_macro: remove tests from Testsuite<br><br>The following tests are removed:<br><br>tests/apps/dial/mid_call_events/dial_macro<br>tests/apps/macro<br>tests/connected_line/macro<br>tests/redirecting/macro<br><br>ASTERISK-30304<br><br>Change-Id: I059a79f1c680267c68b4ecb98347ddcc48084420<br>---<br>D tests/apps/dial/mid_call_events/dial_macro/configs/ast1/extensions.conf<br>D tests/apps/dial/mid_call_events/dial_macro/test-config.yaml<br>M tests/apps/dial/mid_call_events/tests.yaml<br>D tests/apps/macro/park_timeout_inside/configs/ast1/extensions.conf<br>D tests/apps/macro/park_timeout_inside/configs/ast1/res_parking.conf<br>D tests/apps/macro/park_timeout_inside/test-config.yaml<br>D tests/apps/macro/park_timeout_outside/configs/ast1/extensions.conf<br>D tests/apps/macro/park_timeout_outside/configs/ast1/res_parking.conf<br>D tests/apps/macro/park_timeout_outside/test-config.yaml<br>D tests/apps/macro/redirect_inside/configs/ast1/extensions.conf<br>D tests/apps/macro/redirect_inside/test-config.yaml<br>D tests/apps/macro/redirect_outside/configs/ast1/extensions.conf<br>D tests/apps/macro/redirect_outside/test-config.yaml<br>D tests/apps/macro/tests.yaml<br>A tests/apps/queues/gosub_test/configs/ast1/extensions.conf<br>R tests/apps/queues/gosub_test/configs/ast1/queues.conf<br>A tests/apps/queues/gosub_test/run-test<br>R tests/apps/queues/gosub_test/test-config.yaml<br>R tests/apps/queues/gosub_test/test.lua<br>D tests/apps/queues/macro_gosub_test/configs/ast1/extensions.conf<br>D tests/apps/queues/macro_gosub_test/run-test<br>M tests/apps/queues/tests.yaml<br>M tests/apps/tests.yaml<br>M tests/cdr/cdr_dial_subroutines/configs/ast1/extensions.conf<br>M tests/cdr/cdr_dial_subroutines/test-config.yaml<br>D tests/connected_line/macro/configs/ast1/extensions.conf<br>D tests/connected_line/macro/run-test<br>D tests/connected_line/macro/test-config.yaml<br>M tests/connected_line/tests.yaml<br>D tests/redirecting/macro/configs/ast1/extensions.conf<br>D tests/redirecting/macro/run-test<br>D tests/redirecting/macro/test-config.yaml<br>M tests/redirecting/tests.yaml<br>33 files changed, 58 insertions(+), 902 deletions(-)<br><br></pre>
<pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/apps/dial/mid_call_events/dial_macro/configs/ast1/extensions.conf b/tests/apps/dial/mid_call_events/dial_macro/configs/ast1/extensions.conf</span><br><span>deleted file mode 100644</span><br><span>index 2060145..0000000</span><br><span>--- a/tests/apps/dial/mid_call_events/dial_macro/configs/ast1/extensions.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,58 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[macro-mid_call]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Set(MACRO_RESULT=${ARG1})</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,UserEvent(MidCall, result: ${MACRO_RESULT})</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[macro-mid_call_goto_full]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Set(MACRO_RESULT=GOTO:goto_full_context^goto_full_jump^1)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,UserEvent(MidCall, result: ${MACRO_RESULT})</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[default]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => abort,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Dial(Local/target,,M(mid_call^ABORT))</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Hangup()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => congestion,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Dial(Local/target,,M(mid_call^CONGESTION))</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Hangup()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => busy,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Dial(Local/target,,M(mid_call^BUSY))</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Hangup()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => continue,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Dial(Local/target,,M(mid_call^CONTINUE))</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,UserEvent(Continue)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Hangup()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => goto,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Dial(Local/target,,M(mid_call^GOTO:jump))</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,UserEvent(Jump, result: failed)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Hangup()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n(jump),NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,UserEvent(Jump, result: passed)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Hangup()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => goto_full,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Dial(Local/target,,M(mid_call_goto_full))</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,UserEvent(Jump, result: failed)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Hangup()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => invalid,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Dial(Local/target,,M(mid_call^BLAH))</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Hangup()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => target,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Answer()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Echo()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[goto_full_context]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => goto_full_jump,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,UserEvent(Jump, result: passed)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Hangup()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/apps/dial/mid_call_events/dial_macro/test-config.yaml b/tests/apps/dial/mid_call_events/dial_macro/test-config.yaml</span><br><span>deleted file mode 100644</span><br><span>index b7a1081..0000000</span><br><span>--- a/tests/apps/dial/mid_call_events/dial_macro/test-config.yaml</span><br><span>+++ /dev/null</span><br><span>@@ -1,300 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-testinfo:</span><br><span style="color: hsl(0, 100%, 40%);">- summary: 'Test mid-call Macro execution during a dial'</span><br><span style="color: hsl(0, 100%, 40%);">- description: |</span><br><span style="color: hsl(0, 100%, 40%);">- This test verifies mid-call Macro execution using the M option</span><br><span style="color: hsl(0, 100%, 40%);">- on the calling channel during a dial. Execution occurs after the</span><br><span style="color: hsl(0, 100%, 40%);">- called channel has answered but before bridging. The test verifies</span><br><span style="color: hsl(0, 100%, 40%);">- that the result of the Macro affects the overall result of the Dial.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-test-modules:</span><br><span style="color: hsl(0, 100%, 40%);">- test-object:</span><br><span style="color: hsl(0, 100%, 40%);">- config-section: test-config</span><br><span style="color: hsl(0, 100%, 40%);">- typename: 'test_case.SimpleTestCase'</span><br><span style="color: hsl(0, 100%, 40%);">- modules:</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- config-section: 'ami-config'</span><br><span style="color: hsl(0, 100%, 40%);">- typename: 'ami.AMIEventModule'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- config-section: 'dial-events-12'</span><br><span style="color: hsl(0, 100%, 40%);">- typename: 'ami.AMIEventModule'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- config-section: cdr-config-12</span><br><span style="color: hsl(0, 100%, 40%);">- typename: 'cdr.CDRModule'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- config-section: 'hangup-bridged-12'</span><br><span style="color: hsl(0, 100%, 40%);">- typename: 'pluggable_modules.AMIChannelHangup'</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-test-config:</span><br><span style="color: hsl(0, 100%, 40%);">- spawn-after-hangup: True</span><br><span style="color: hsl(0, 100%, 40%);">- expected_events: 0</span><br><span style="color: hsl(0, 100%, 40%);">- ignore-originate-failures: True</span><br><span style="color: hsl(0, 100%, 40%);">- test-iterations:</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'Local/abort@default'</span><br><span style="color: hsl(0, 100%, 40%);">- application: 'Echo'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'Local/busy@default'</span><br><span style="color: hsl(0, 100%, 40%);">- application: 'Echo'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'Local/congestion@default'</span><br><span style="color: hsl(0, 100%, 40%);">- application: 'Echo'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'Local/continue@default'</span><br><span style="color: hsl(0, 100%, 40%);">- application: 'Echo'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'Local/goto@default'</span><br><span style="color: hsl(0, 100%, 40%);">- application: 'Echo'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'Local/goto_full@default'</span><br><span style="color: hsl(0, 100%, 40%);">- application: 'Echo'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'Local/invalid@default'</span><br><span style="color: hsl(0, 100%, 40%);">- application: 'Echo'</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-ami-config:</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- type: 'headermatch'</span><br><span style="color: hsl(0, 100%, 40%);">- conditions:</span><br><span style="color: hsl(0, 100%, 40%);">- match:</span><br><span style="color: hsl(0, 100%, 40%);">- Event: 'UserEvent'</span><br><span style="color: hsl(0, 100%, 40%);">- UserEvent: 'MidCall'</span><br><span style="color: hsl(0, 100%, 40%);">- count: '7'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- type: 'headermatch'</span><br><span style="color: hsl(0, 100%, 40%);">- conditions:</span><br><span style="color: hsl(0, 100%, 40%);">- match:</span><br><span style="color: hsl(0, 100%, 40%);">- Event: 'UserEvent'</span><br><span style="color: hsl(0, 100%, 40%);">- UserEvent: 'Jump'</span><br><span style="color: hsl(0, 100%, 40%);">- requirements:</span><br><span style="color: hsl(0, 100%, 40%);">- match:</span><br><span style="color: hsl(0, 100%, 40%);">- result: 'pass'</span><br><span style="color: hsl(0, 100%, 40%);">- count: '2'</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-dial-events-12:</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- type: 'headermatch'</span><br><span style="color: hsl(0, 100%, 40%);">- conditions:</span><br><span style="color: hsl(0, 100%, 40%);">- match:</span><br><span style="color: hsl(0, 100%, 40%);">- Event: 'DialEnd'</span><br><span style="color: hsl(0, 100%, 40%);">- Channel: 'Local/abort-.{8};2'</span><br><span style="color: hsl(0, 100%, 40%);">- requirements:</span><br><span style="color: hsl(0, 100%, 40%);">- DestChannel: 'Local/target-.{8};1'</span><br><span style="color: hsl(0, 100%, 40%);">- DialStatus: 'ABORT'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- type: 'headermatch'</span><br><span style="color: hsl(0, 100%, 40%);">- conditions:</span><br><span style="color: hsl(0, 100%, 40%);">- match:</span><br><span style="color: hsl(0, 100%, 40%);">- Event: 'DialEnd'</span><br><span style="color: hsl(0, 100%, 40%);">- Channel: 'Local/busy-.{8};2'</span><br><span style="color: hsl(0, 100%, 40%);">- requirements:</span><br><span style="color: hsl(0, 100%, 40%);">- DestChannel: 'Local/target-.{8};1'</span><br><span style="color: hsl(0, 100%, 40%);">- DialStatus: 'BUSY'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- type: 'headermatch'</span><br><span style="color: hsl(0, 100%, 40%);">- conditions:</span><br><span style="color: hsl(0, 100%, 40%);">- match:</span><br><span style="color: hsl(0, 100%, 40%);">- Event: 'DialEnd'</span><br><span style="color: hsl(0, 100%, 40%);">- Channel: 'Local/congestion-.{8};2'</span><br><span style="color: hsl(0, 100%, 40%);">- requirements:</span><br><span style="color: hsl(0, 100%, 40%);">- DestChannel: 'Local/target-.{8};1'</span><br><span style="color: hsl(0, 100%, 40%);">- DialStatus: 'CONGESTION'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- type: 'headermatch'</span><br><span style="color: hsl(0, 100%, 40%);">- conditions:</span><br><span style="color: hsl(0, 100%, 40%);">- match:</span><br><span style="color: hsl(0, 100%, 40%);">- Event: 'DialEnd'</span><br><span style="color: hsl(0, 100%, 40%);">- Channel: 'Local/continue-.{8};2'</span><br><span style="color: hsl(0, 100%, 40%);">- requirements:</span><br><span style="color: hsl(0, 100%, 40%);">- DestChannel: 'Local/target-.{8};1'</span><br><span style="color: hsl(0, 100%, 40%);">- DialStatus: 'CONTINUE'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- type: 'headermatch'</span><br><span style="color: hsl(0, 100%, 40%);">- conditions:</span><br><span style="color: hsl(0, 100%, 40%);">- match:</span><br><span style="color: hsl(0, 100%, 40%);">- Event: 'DialEnd'</span><br><span style="color: hsl(0, 100%, 40%);">- Channel: 'Local/goto-.{8};2'</span><br><span style="color: hsl(0, 100%, 40%);">- requirements:</span><br><span style="color: hsl(0, 100%, 40%);">- DestChannel: 'Local/target-.{8};1'</span><br><span style="color: hsl(0, 100%, 40%);">- DialStatus: 'GOTO:jump'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- type: 'headermatch'</span><br><span style="color: hsl(0, 100%, 40%);">- conditions:</span><br><span style="color: hsl(0, 100%, 40%);">- match:</span><br><span style="color: hsl(0, 100%, 40%);">- Event: 'DialEnd'</span><br><span style="color: hsl(0, 100%, 40%);">- Channel: 'Local/goto_full-.{8};2'</span><br><span style="color: hsl(0, 100%, 40%);">- requirements:</span><br><span style="color: hsl(0, 100%, 40%);">- DestChannel: 'Local/target-.{8};1'</span><br><span style="color: hsl(0, 100%, 40%);">- DialStatus: 'GOTO:goto_full_context,goto_full_jump,1'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- type: 'headermatch'</span><br><span style="color: hsl(0, 100%, 40%);">- conditions:</span><br><span style="color: hsl(0, 100%, 40%);">- match:</span><br><span style="color: hsl(0, 100%, 40%);">- Event: 'DialEnd'</span><br><span style="color: hsl(0, 100%, 40%);">- Channel: 'Local/invalid@default-.{8};2'</span><br><span style="color: hsl(0, 100%, 40%);">- requirements:</span><br><span style="color: hsl(0, 100%, 40%);">- DestChannel: 'Local/target@default-.{8};1'</span><br><span style="color: hsl(0, 100%, 40%);">- DialStatus: 'ANSWER'</span><br><span style="color: hsl(0, 100%, 40%);">- count: '1'</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-hangup-bridged-12:</span><br><span style="color: hsl(0, 100%, 40%);">- type: 'headermatch'</span><br><span style="color: hsl(0, 100%, 40%);">- delay: 2</span><br><span style="color: hsl(0, 100%, 40%);">- conditions:</span><br><span style="color: hsl(0, 100%, 40%);">- match:</span><br><span style="color: hsl(0, 100%, 40%);">- Event: 'BridgeEnter'</span><br><span style="color: hsl(0, 100%, 40%);">- Channel: 'Local/invalid@default-.{8};2'</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-cdr-config-12:</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- file: 'Master'</span><br><span style="color: hsl(0, 100%, 40%);">- lines:</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- accountcode: ''</span><br><span style="color: hsl(0, 100%, 40%);">- destination: 'target'</span><br><span style="color: hsl(0, 100%, 40%);">- dcontext: 'default'</span><br><span style="color: hsl(0, 100%, 40%);">- callerid: '"" <>'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'Local/target@default-.{8};2'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: ''</span><br><span style="color: hsl(0, 100%, 40%);">- lastapp: 'Answer'</span><br><span style="color: hsl(0, 100%, 40%);">- disposition: 'ANSWERED'</span><br><span style="color: hsl(0, 100%, 40%);">- amaflags: 'DOCUMENTATION'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- accountcode: ''</span><br><span style="color: hsl(0, 100%, 40%);">- destination: 'abort'</span><br><span style="color: hsl(0, 100%, 40%);">- dcontext: 'default'</span><br><span style="color: hsl(0, 100%, 40%);">- callerid: '"" <>'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'Local/abort@default-.{8};2'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: 'Local/target@default-.{8};1'</span><br><span style="color: hsl(0, 100%, 40%);">- lastapp: 'Dial'</span><br><span style="color: hsl(0, 100%, 40%);">- disposition: 'FAILED'</span><br><span style="color: hsl(0, 100%, 40%);">- amaflags: 'DOCUMENTATION'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- accountcode: ''</span><br><span style="color: hsl(0, 100%, 40%);">- destination: 'target'</span><br><span style="color: hsl(0, 100%, 40%);">- dcontext: 'default'</span><br><span style="color: hsl(0, 100%, 40%);">- callerid: '"" <>'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'Local/target@default-.{8};2'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: ''</span><br><span style="color: hsl(0, 100%, 40%);">- lastapp: 'Answer'</span><br><span style="color: hsl(0, 100%, 40%);">- disposition: 'ANSWERED'</span><br><span style="color: hsl(0, 100%, 40%);">- amaflags: 'DOCUMENTATION'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- accountcode: ''</span><br><span style="color: hsl(0, 100%, 40%);">- destination: 'busy'</span><br><span style="color: hsl(0, 100%, 40%);">- dcontext: 'default'</span><br><span style="color: hsl(0, 100%, 40%);">- callerid: '"" <>'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'Local/busy@default-.{8};2'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: 'Local/target@default-.{8};1'</span><br><span style="color: hsl(0, 100%, 40%);">- lastapp: 'Dial'</span><br><span style="color: hsl(0, 100%, 40%);">- disposition: 'BUSY'</span><br><span style="color: hsl(0, 100%, 40%);">- amaflags: 'DOCUMENTATION'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- accountcode: ''</span><br><span style="color: hsl(0, 100%, 40%);">- destination: 'target'</span><br><span style="color: hsl(0, 100%, 40%);">- dcontext: 'default'</span><br><span style="color: hsl(0, 100%, 40%);">- callerid: '"" <>'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'Local/target@default-.{8};2'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: ''</span><br><span style="color: hsl(0, 100%, 40%);">- lastapp: 'Answer'</span><br><span style="color: hsl(0, 100%, 40%);">- disposition: 'ANSWERED'</span><br><span style="color: hsl(0, 100%, 40%);">- amaflags: 'DOCUMENTATION'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- accountcode: ''</span><br><span style="color: hsl(0, 100%, 40%);">- destination: 'congestion'</span><br><span style="color: hsl(0, 100%, 40%);">- dcontext: 'default'</span><br><span style="color: hsl(0, 100%, 40%);">- callerid: '"" <>'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'Local/congestion@default-.{8};2'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: 'Local/target@default-.{8};1'</span><br><span style="color: hsl(0, 100%, 40%);">- lastapp: 'Dial'</span><br><span style="color: hsl(0, 100%, 40%);">- disposition: 'FAILED'</span><br><span style="color: hsl(0, 100%, 40%);">- amaflags: 'DOCUMENTATION'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- accountcode: ''</span><br><span style="color: hsl(0, 100%, 40%);">- destination: 'target'</span><br><span style="color: hsl(0, 100%, 40%);">- dcontext: 'default'</span><br><span style="color: hsl(0, 100%, 40%);">- callerid: '"" <>'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'Local/target@default-.{8};2'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: ''</span><br><span style="color: hsl(0, 100%, 40%);">- lastapp: 'Answer'</span><br><span style="color: hsl(0, 100%, 40%);">- disposition: 'ANSWERED'</span><br><span style="color: hsl(0, 100%, 40%);">- amaflags: 'DOCUMENTATION'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- accountcode: ''</span><br><span style="color: hsl(0, 100%, 40%);">- destination: 'continue'</span><br><span style="color: hsl(0, 100%, 40%);">- dcontext: 'default'</span><br><span style="color: hsl(0, 100%, 40%);">- callerid: '"" <>'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'Local/continue@default-.{8};2'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: 'Local/target@default-.{8};1'</span><br><span style="color: hsl(0, 100%, 40%);">- lastapp: 'Dial'</span><br><span style="color: hsl(0, 100%, 40%);">- disposition: 'FAILED'</span><br><span style="color: hsl(0, 100%, 40%);">- amaflags: 'DOCUMENTATION'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- accountcode: ''</span><br><span style="color: hsl(0, 100%, 40%);">- destination: 'target'</span><br><span style="color: hsl(0, 100%, 40%);">- dcontext: 'default'</span><br><span style="color: hsl(0, 100%, 40%);">- callerid: '"" <>'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'Local/target@default-.{8};2'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: ''</span><br><span style="color: hsl(0, 100%, 40%);">- lastapp: 'Answer'</span><br><span style="color: hsl(0, 100%, 40%);">- disposition: 'ANSWERED'</span><br><span style="color: hsl(0, 100%, 40%);">- amaflags: 'DOCUMENTATION'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- accountcode: ''</span><br><span style="color: hsl(0, 100%, 40%);">- destination: 'goto'</span><br><span style="color: hsl(0, 100%, 40%);">- dcontext: 'default'</span><br><span style="color: hsl(0, 100%, 40%);">- callerid: '"" <>'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'Local/goto@default-.{8};2'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: 'Local/target@default-.{8};1'</span><br><span style="color: hsl(0, 100%, 40%);">- lastapp: 'Dial'</span><br><span style="color: hsl(0, 100%, 40%);">- disposition: 'FAILED'</span><br><span style="color: hsl(0, 100%, 40%);">- amaflags: 'DOCUMENTATION'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- accountcode: ''</span><br><span style="color: hsl(0, 100%, 40%);">- destination: 'target'</span><br><span style="color: hsl(0, 100%, 40%);">- dcontext: 'default'</span><br><span style="color: hsl(0, 100%, 40%);">- callerid: '"" <>'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'Local/target@default-.{8};2'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: ''</span><br><span style="color: hsl(0, 100%, 40%);">- lastapp: 'Answer'</span><br><span style="color: hsl(0, 100%, 40%);">- disposition: 'ANSWERED'</span><br><span style="color: hsl(0, 100%, 40%);">- amaflags: 'DOCUMENTATION'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- accountcode: ''</span><br><span style="color: hsl(0, 100%, 40%);">- destination: 'goto_full'</span><br><span style="color: hsl(0, 100%, 40%);">- dcontext: 'default'</span><br><span style="color: hsl(0, 100%, 40%);">- callerid: '"" <>'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'Local/goto_full@default-.{8};2'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: 'Local/target@default-.{8};1'</span><br><span style="color: hsl(0, 100%, 40%);">- lastapp: 'Dial'</span><br><span style="color: hsl(0, 100%, 40%);">- disposition: 'FAILED'</span><br><span style="color: hsl(0, 100%, 40%);">- amaflags: 'DOCUMENTATION'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- accountcode: ''</span><br><span style="color: hsl(0, 100%, 40%);">- destination: 'invalid'</span><br><span style="color: hsl(0, 100%, 40%);">- dcontext: 'default'</span><br><span style="color: hsl(0, 100%, 40%);">- callerid: '"" <>'</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'Local/invalid@default-.{8};2'</span><br><span style="color: hsl(0, 100%, 40%);">- dchannel: 'Local/target@default-.{8};1'</span><br><span style="color: hsl(0, 100%, 40%);">- lastapp: 'Dial'</span><br><span style="color: hsl(0, 100%, 40%);">- disposition: 'ANSWERED'</span><br><span style="color: hsl(0, 100%, 40%);">- amaflags: 'DOCUMENTATION'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- dcontext: 'default'</span><br><span style="color: hsl(0, 100%, 40%);">- lastapp: 'Echo'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- dcontext: 'default'</span><br><span style="color: hsl(0, 100%, 40%);">- lastapp: 'Echo'</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-properties:</span><br><span style="color: hsl(0, 100%, 40%);">- dependencies:</span><br><span style="color: hsl(0, 100%, 40%);">- - python : 'twisted'</span><br><span style="color: hsl(0, 100%, 40%);">- - python : 'starpy'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'app_dial'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'app_echo'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'app_macro'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'app_userevent'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'cdr_csv'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'pbx_config'</span><br><span style="color: hsl(0, 100%, 40%);">- tags:</span><br><span style="color: hsl(0, 100%, 40%);">- - dial</span><br><span style="color: hsl(0, 100%, 40%);">- - CDR</span><br><span>diff --git a/tests/apps/dial/mid_call_events/tests.yaml b/tests/apps/dial/mid_call_events/tests.yaml</span><br><span>index aab45d1..1dbc211 100644</span><br><span>--- a/tests/apps/dial/mid_call_events/tests.yaml</span><br><span>+++ b/tests/apps/dial/mid_call_events/tests.yaml</span><br><span>@@ -1,4 +1,3 @@</span><br><span> # Enter tests here in the order they should be considered for execution:</span><br><span> tests:</span><br><span style="color: hsl(0, 100%, 40%);">- - test: 'dial_gosub'</span><br><span style="color: hsl(0, 100%, 40%);">- - test: 'dial_macro'</span><br><span style="color: hsl(120, 100%, 40%);">+ - test: 'dial_gosub'</span><br><span>\ No newline at end of file</span><br><span>diff --git a/tests/apps/macro/park_timeout_inside/configs/ast1/extensions.conf b/tests/apps/macro/park_timeout_inside/configs/ast1/extensions.conf</span><br><span>deleted file mode 100644</span><br><span>index 9e360fd..0000000</span><br><span>--- a/tests/apps/macro/park_timeout_inside/configs/ast1/extensions.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,18 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[macro-park_me]</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,1,NoOp(Inside macro)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Park(default,sc(macro-park_me,s,500))</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Hangup()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-; After a park timeout to here we are no longer running a Macro</span><br><span style="color: hsl(0, 100%, 40%);">-; but just executing extensions within a context.</span><br><span style="color: hsl(0, 100%, 40%);">-same => 500,NoOp(Channel timed out of parking lot)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,UserEvent(ParkTimeout)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Echo()</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Hangup()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[default]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,1,NoOp(Initial dialplan location)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Macro(park_me)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Hangup()</span><br><span>diff --git a/tests/apps/macro/park_timeout_inside/configs/ast1/res_parking.conf b/tests/apps/macro/park_timeout_inside/configs/ast1/res_parking.conf</span><br><span>deleted file mode 100644</span><br><span>index 51d655c..0000000</span><br><span>--- a/tests/apps/macro/park_timeout_inside/configs/ast1/res_parking.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,4 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[default]</span><br><span style="color: hsl(0, 100%, 40%);">-parkingtime = 3</span><br><span>diff --git a/tests/apps/macro/park_timeout_inside/test-config.yaml b/tests/apps/macro/park_timeout_inside/test-config.yaml</span><br><span>deleted file mode 100644</span><br><span>index d8e85e2..0000000</span><br><span>--- a/tests/apps/macro/park_timeout_inside/test-config.yaml</span><br><span>+++ /dev/null</span><br><span>@@ -1,29 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-testinfo:</span><br><span style="color: hsl(0, 100%, 40%);">- summary: 'Timeout a parked channel that is within a Macro to an exten inside the macro context'</span><br><span style="color: hsl(0, 100%, 40%);">- description: |</span><br><span style="color: hsl(0, 100%, 40%);">- Park a channel that is within an active Macro and have it timeout</span><br><span style="color: hsl(0, 100%, 40%);">- to a location inside of that macro context, verify that it gets redirected</span><br><span style="color: hsl(0, 100%, 40%);">- to the expected dialplan location.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-properties:</span><br><span style="color: hsl(0, 100%, 40%);">- dependencies:</span><br><span style="color: hsl(0, 100%, 40%);">- - python : 'twisted'</span><br><span style="color: hsl(0, 100%, 40%);">- - python : 'starpy'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'app_echo'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'app_macro'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'app_userevent'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'res_parking'</span><br><span style="color: hsl(0, 100%, 40%);">- tags:</span><br><span style="color: hsl(0, 100%, 40%);">- - macro</span><br><span style="color: hsl(0, 100%, 40%);">- - parking</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-test-modules:</span><br><span style="color: hsl(0, 100%, 40%);">- test-object:</span><br><span style="color: hsl(0, 100%, 40%);">- config-section: test-config</span><br><span style="color: hsl(0, 100%, 40%);">- typename: 'test_case.SimpleTestCase'</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-test-config:</span><br><span style="color: hsl(0, 100%, 40%);">- test-iterations:</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'Local/s@default'</span><br><span style="color: hsl(0, 100%, 40%);">- application: 'Echo'</span><br><span>diff --git a/tests/apps/macro/park_timeout_outside/configs/ast1/extensions.conf b/tests/apps/macro/park_timeout_outside/configs/ast1/extensions.conf</span><br><span>deleted file mode 100644</span><br><span>index 175f08b..0000000</span><br><span>--- a/tests/apps/macro/park_timeout_outside/configs/ast1/extensions.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,16 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[macro-park_me]</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,1,NoOp(Inside macro)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Park(default,sc(default,park_timeout,1))</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Hangup()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[default]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,1,NoOp(Initial dialplan location)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Macro(park_me)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Hangup()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => park_timeout,1,NoOp(Channel timed out of parking lot)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,UserEvent(ParkTimeout)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Echo()</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Hangup()</span><br><span>diff --git a/tests/apps/macro/park_timeout_outside/configs/ast1/res_parking.conf b/tests/apps/macro/park_timeout_outside/configs/ast1/res_parking.conf</span><br><span>deleted file mode 100644</span><br><span>index 51d655c..0000000</span><br><span>--- a/tests/apps/macro/park_timeout_outside/configs/ast1/res_parking.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,4 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[general]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[default]</span><br><span style="color: hsl(0, 100%, 40%);">-parkingtime = 3</span><br><span>diff --git a/tests/apps/macro/park_timeout_outside/test-config.yaml b/tests/apps/macro/park_timeout_outside/test-config.yaml</span><br><span>deleted file mode 100644</span><br><span>index 11c8f77..0000000</span><br><span>--- a/tests/apps/macro/park_timeout_outside/test-config.yaml</span><br><span>+++ /dev/null</span><br><span>@@ -1,29 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-testinfo:</span><br><span style="color: hsl(0, 100%, 40%);">- summary: 'Timeout a parked channel that is within a Macro to an exten outside the macro'</span><br><span style="color: hsl(0, 100%, 40%);">- description: |</span><br><span style="color: hsl(0, 100%, 40%);">- Park a channel that is within an active Macro and have it timeout</span><br><span style="color: hsl(0, 100%, 40%);">- to a location outside of that macro, verify that it gets redirected</span><br><span style="color: hsl(0, 100%, 40%);">- to the expected dialplan location.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-properties:</span><br><span style="color: hsl(0, 100%, 40%);">- dependencies:</span><br><span style="color: hsl(0, 100%, 40%);">- - python : 'twisted'</span><br><span style="color: hsl(0, 100%, 40%);">- - python : 'starpy'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'app_echo'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'app_macro'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'app_userevent'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'res_parking'</span><br><span style="color: hsl(0, 100%, 40%);">- tags:</span><br><span style="color: hsl(0, 100%, 40%);">- - macro</span><br><span style="color: hsl(0, 100%, 40%);">- - parking</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-test-modules:</span><br><span style="color: hsl(0, 100%, 40%);">- test-object:</span><br><span style="color: hsl(0, 100%, 40%);">- config-section: test-config</span><br><span style="color: hsl(0, 100%, 40%);">- typename: 'test_case.SimpleTestCase'</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-test-config:</span><br><span style="color: hsl(0, 100%, 40%);">- test-iterations:</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'Local/s@default'</span><br><span style="color: hsl(0, 100%, 40%);">- application: 'Echo'</span><br><span>diff --git a/tests/apps/macro/redirect_inside/configs/ast1/extensions.conf b/tests/apps/macro/redirect_inside/configs/ast1/extensions.conf</span><br><span>deleted file mode 100644</span><br><span>index c45120b..0000000</span><br><span>--- a/tests/apps/macro/redirect_inside/configs/ast1/extensions.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,19 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[macro-redirect_me]</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,1,NoOp(Inside macro)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Echo()</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Hangup()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-; After a redirect to here we are no longer running a Macro</span><br><span style="color: hsl(0, 100%, 40%);">-; but just executing extensions within a context.</span><br><span style="color: hsl(0, 100%, 40%);">-same => 500,NoOp(Channel redirected)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,UserEvent(Redirected)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Echo()</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Hangup()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[default]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,1,NoOp(Initial dialplan location)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Answer()</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Macro(redirect_me)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Hangup()</span><br><span>diff --git a/tests/apps/macro/redirect_inside/test-config.yaml b/tests/apps/macro/redirect_inside/test-config.yaml</span><br><span>deleted file mode 100644</span><br><span>index 59b3772..0000000</span><br><span>--- a/tests/apps/macro/redirect_inside/test-config.yaml</span><br><span>+++ /dev/null</span><br><span>@@ -1,74 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-testinfo:</span><br><span style="color: hsl(0, 100%, 40%);">- summary: 'Redirect a channel that is within a Macro to an exten inside the macro context'</span><br><span style="color: hsl(0, 100%, 40%);">- description: |</span><br><span style="color: hsl(0, 100%, 40%);">- Redirect a channel that is in the Echo application within an</span><br><span style="color: hsl(0, 100%, 40%);">- active Macro to a location inside of that macro context, verify</span><br><span style="color: hsl(0, 100%, 40%);">- that it gets redirected to the expected dialplan location.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-properties:</span><br><span style="color: hsl(0, 100%, 40%);">- dependencies:</span><br><span style="color: hsl(0, 100%, 40%);">- - python : 'twisted'</span><br><span style="color: hsl(0, 100%, 40%);">- - python : 'starpy'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'app_echo'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'app_macro'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'app_userevent'</span><br><span style="color: hsl(0, 100%, 40%);">- tags:</span><br><span style="color: hsl(0, 100%, 40%);">- - manager</span><br><span style="color: hsl(0, 100%, 40%);">- - macro</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-test-modules:</span><br><span style="color: hsl(0, 100%, 40%);">- test-object:</span><br><span style="color: hsl(0, 100%, 40%);">- config-section: test-config</span><br><span style="color: hsl(0, 100%, 40%);">- typename: 'test_case.SimpleTestCase'</span><br><span style="color: hsl(0, 100%, 40%);">- modules:</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- config-section: event-action-config</span><br><span style="color: hsl(0, 100%, 40%);">- typename: 'pluggable_modules.EventActionModule'</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-test-config:</span><br><span style="color: hsl(0, 100%, 40%);">- test-iterations:</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'Local/s@default'</span><br><span style="color: hsl(0, 100%, 40%);">- application: 'Echo'</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-event-action-config:</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- ami-events:</span><br><span style="color: hsl(0, 100%, 40%);">- # The Newexten event is the only event available in v11+</span><br><span style="color: hsl(0, 100%, 40%);">- # that we can trigger on to know when we are in the Macro</span><br><span style="color: hsl(0, 100%, 40%);">- # and about to enter the Echo application.</span><br><span style="color: hsl(0, 100%, 40%);">- #</span><br><span style="color: hsl(0, 100%, 40%);">- # Sending a UserEvent could work but the SimpleTestCase</span><br><span style="color: hsl(0, 100%, 40%);">- # initiates the next call in the test-iterations list or</span><br><span style="color: hsl(0, 100%, 40%);">- # ends the test if there are no more. We would need some</span><br><span style="color: hsl(0, 100%, 40%);">- # dummy 'keepalive' calls to keep the test going.</span><br><span style="color: hsl(0, 100%, 40%);">- conditions:</span><br><span style="color: hsl(0, 100%, 40%);">- match:</span><br><span style="color: hsl(0, 100%, 40%);">- Event: 'Newexten'</span><br><span style="color: hsl(0, 100%, 40%);">- Context: 'macro-redirect_me'</span><br><span style="color: hsl(0, 100%, 40%);">- # Exten: 's'</span><br><span style="color: hsl(0, 100%, 40%);">- # or</span><br><span style="color: hsl(0, 100%, 40%);">- # Extension: 's'</span><br><span style="color: hsl(0, 100%, 40%);">- Priority: '2'</span><br><span style="color: hsl(0, 100%, 40%);">- requirements:</span><br><span style="color: hsl(0, 100%, 40%);">- # For sanity this is supposed to be the priority</span><br><span style="color: hsl(0, 100%, 40%);">- # executing the Echo application.</span><br><span style="color: hsl(0, 100%, 40%);">- match:</span><br><span style="color: hsl(0, 100%, 40%);">- Application: 'Echo'</span><br><span style="color: hsl(0, 100%, 40%);">- count: '1'</span><br><span style="color: hsl(0, 100%, 40%);">- trigger-on-count: True</span><br><span style="color: hsl(0, 100%, 40%);">- ami-actions:</span><br><span style="color: hsl(0, 100%, 40%);">- # Redirect the channel to somewhere inside the macro context</span><br><span style="color: hsl(0, 100%, 40%);">- action:</span><br><span style="color: hsl(0, 100%, 40%);">- Action: 'Redirect'</span><br><span style="color: hsl(0, 100%, 40%);">- Channel: 'Local/s@default-00000000;2'</span><br><span style="color: hsl(0, 100%, 40%);">- Context: 'macro-redirect_me'</span><br><span style="color: hsl(0, 100%, 40%);">- Exten: 's'</span><br><span style="color: hsl(0, 100%, 40%);">- Priority: '500'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- ami-events:</span><br><span style="color: hsl(0, 100%, 40%);">- conditions:</span><br><span style="color: hsl(0, 100%, 40%);">- match:</span><br><span style="color: hsl(0, 100%, 40%);">- Event: 'UserEvent'</span><br><span style="color: hsl(0, 100%, 40%);">- UserEvent: 'Redirected'</span><br><span style="color: hsl(0, 100%, 40%);">- count: '1'</span><br><span>diff --git a/tests/apps/macro/redirect_outside/configs/ast1/extensions.conf b/tests/apps/macro/redirect_outside/configs/ast1/extensions.conf</span><br><span>deleted file mode 100644</span><br><span>index c1989a0..0000000</span><br><span>--- a/tests/apps/macro/redirect_outside/configs/ast1/extensions.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,17 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[macro-redirect_me]</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,1,NoOp(Inside macro)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Echo()</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Hangup()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[default]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,1,NoOp(Initial dialplan location)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Answer()</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Macro(redirect_me)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Hangup()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => redirect,1,NoOp(Channel redirected)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,UserEvent(Redirected)</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Echo()</span><br><span style="color: hsl(0, 100%, 40%);">-same => n,Hangup()</span><br><span>diff --git a/tests/apps/macro/redirect_outside/test-config.yaml b/tests/apps/macro/redirect_outside/test-config.yaml</span><br><span>deleted file mode 100644</span><br><span>index 109abc6..0000000</span><br><span>--- a/tests/apps/macro/redirect_outside/test-config.yaml</span><br><span>+++ /dev/null</span><br><span>@@ -1,74 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-testinfo:</span><br><span style="color: hsl(0, 100%, 40%);">- summary: 'Redirect a channel that is within a Macro to an exten outside the macro'</span><br><span style="color: hsl(0, 100%, 40%);">- description: |</span><br><span style="color: hsl(0, 100%, 40%);">- Redirect a channel that is in the Echo application within an</span><br><span style="color: hsl(0, 100%, 40%);">- active Macro to a location outside of that macro, verify</span><br><span style="color: hsl(0, 100%, 40%);">- that it gets redirected to the expected dialplan location.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-properties:</span><br><span style="color: hsl(0, 100%, 40%);">- dependencies:</span><br><span style="color: hsl(0, 100%, 40%);">- - python : 'twisted'</span><br><span style="color: hsl(0, 100%, 40%);">- - python : 'starpy'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'app_echo'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'app_macro'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'app_userevent'</span><br><span style="color: hsl(0, 100%, 40%);">- tags:</span><br><span style="color: hsl(0, 100%, 40%);">- - manager</span><br><span style="color: hsl(0, 100%, 40%);">- - macro</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-test-modules:</span><br><span style="color: hsl(0, 100%, 40%);">- test-object:</span><br><span style="color: hsl(0, 100%, 40%);">- config-section: test-config</span><br><span style="color: hsl(0, 100%, 40%);">- typename: 'test_case.SimpleTestCase'</span><br><span style="color: hsl(0, 100%, 40%);">- modules:</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- config-section: event-action-config</span><br><span style="color: hsl(0, 100%, 40%);">- typename: 'pluggable_modules.EventActionModule'</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-test-config:</span><br><span style="color: hsl(0, 100%, 40%);">- test-iterations:</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- channel: 'Local/s@default'</span><br><span style="color: hsl(0, 100%, 40%);">- application: 'Echo'</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-event-action-config:</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- ami-events:</span><br><span style="color: hsl(0, 100%, 40%);">- # The Newexten event is the only event available in v11+</span><br><span style="color: hsl(0, 100%, 40%);">- # that we can trigger on to know when we are in the Macro</span><br><span style="color: hsl(0, 100%, 40%);">- # and about to enter the Echo application.</span><br><span style="color: hsl(0, 100%, 40%);">- #</span><br><span style="color: hsl(0, 100%, 40%);">- # Sending a UserEvent could work but the SimpleTestCase</span><br><span style="color: hsl(0, 100%, 40%);">- # initiates the next call in the test-iterations list or</span><br><span style="color: hsl(0, 100%, 40%);">- # ends the test if there are no more. We would need some</span><br><span style="color: hsl(0, 100%, 40%);">- # dummy 'keepalive' calls to keep the test going.</span><br><span style="color: hsl(0, 100%, 40%);">- conditions:</span><br><span style="color: hsl(0, 100%, 40%);">- match:</span><br><span style="color: hsl(0, 100%, 40%);">- Event: 'Newexten'</span><br><span style="color: hsl(0, 100%, 40%);">- Context: 'macro-redirect_me'</span><br><span style="color: hsl(0, 100%, 40%);">- # Exten: 's'</span><br><span style="color: hsl(0, 100%, 40%);">- # or</span><br><span style="color: hsl(0, 100%, 40%);">- # Extension: 's'</span><br><span style="color: hsl(0, 100%, 40%);">- Priority: '2'</span><br><span style="color: hsl(0, 100%, 40%);">- requirements:</span><br><span style="color: hsl(0, 100%, 40%);">- # For sanity this is supposed to be the priority</span><br><span style="color: hsl(0, 100%, 40%);">- # executing the Echo application.</span><br><span style="color: hsl(0, 100%, 40%);">- match:</span><br><span style="color: hsl(0, 100%, 40%);">- Application: 'Echo'</span><br><span style="color: hsl(0, 100%, 40%);">- count: '1'</span><br><span style="color: hsl(0, 100%, 40%);">- trigger-on-count: True</span><br><span style="color: hsl(0, 100%, 40%);">- ami-actions:</span><br><span style="color: hsl(0, 100%, 40%);">- # Redirect the channel to somewhere outside the macro</span><br><span style="color: hsl(0, 100%, 40%);">- action:</span><br><span style="color: hsl(0, 100%, 40%);">- Action: 'Redirect'</span><br><span style="color: hsl(0, 100%, 40%);">- Channel: 'Local/s@default-00000000;2'</span><br><span style="color: hsl(0, 100%, 40%);">- Context: 'default'</span><br><span style="color: hsl(0, 100%, 40%);">- Exten: 'redirect'</span><br><span style="color: hsl(0, 100%, 40%);">- Priority: '1'</span><br><span style="color: hsl(0, 100%, 40%);">- -</span><br><span style="color: hsl(0, 100%, 40%);">- ami-events:</span><br><span style="color: hsl(0, 100%, 40%);">- conditions:</span><br><span style="color: hsl(0, 100%, 40%);">- match:</span><br><span style="color: hsl(0, 100%, 40%);">- Event: 'UserEvent'</span><br><span style="color: hsl(0, 100%, 40%);">- UserEvent: 'Redirected'</span><br><span style="color: hsl(0, 100%, 40%);">- count: '1'</span><br><span>diff --git a/tests/apps/macro/tests.yaml b/tests/apps/macro/tests.yaml</span><br><span>deleted file mode 100644</span><br><span>index f019b58..0000000</span><br><span>--- a/tests/apps/macro/tests.yaml</span><br><span>+++ /dev/null</span><br><span>@@ -1,6 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-# Enter tests here in the order they should be considered for execution:</span><br><span style="color: hsl(0, 100%, 40%);">-tests:</span><br><span style="color: hsl(0, 100%, 40%);">- - test: 'park_timeout_inside'</span><br><span style="color: hsl(0, 100%, 40%);">- - test: 'park_timeout_outside'</span><br><span style="color: hsl(0, 100%, 40%);">- - test: 'redirect_inside'</span><br><span style="color: hsl(0, 100%, 40%);">- - test: 'redirect_outside'</span><br><span>diff --git a/tests/apps/queues/gosub_test/configs/ast1/extensions.conf b/tests/apps/queues/gosub_test/configs/ast1/extensions.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..32b0a92</span><br><span>--- /dev/null</span><br><span>+++ b/tests/apps/queues/gosub_test/configs/ast1/extensions.conf</span><br><span>@@ -0,0 +1,19 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[test_context]</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+exten => answerer,1,Answer</span><br><span style="color: hsl(120, 100%, 40%);">+exten => answerer,n,Wait(2)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => answerer,n,Hangup</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+exten => test1,1,Queue(test_queue)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => test1,n,Hangup</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+exten => test2,1,Queue(test_queue,,,,,,secondarygosub)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => test2,n,Hangup</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[primarygosub]</span><br><span style="color: hsl(120, 100%, 40%);">+exten => s,1,Set(GOSUBVAR=primarygosub)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => s,n,Return</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[secondarygosub]</span><br><span style="color: hsl(120, 100%, 40%);">+exten => s,1,Set(GOSUBVAR=secondarygosub)</span><br><span style="color: hsl(120, 100%, 40%);">+exten => s,n,Return</span><br><span>diff --git a/tests/apps/queues/macro_gosub_test/configs/ast1/queues.conf b/tests/apps/queues/gosub_test/configs/ast1/queues.conf</span><br><span>similarity index 75%</span><br><span>rename from tests/apps/queues/macro_gosub_test/configs/ast1/queues.conf</span><br><span>rename to tests/apps/queues/gosub_test/configs/ast1/queues.conf</span><br><span>index f4d9270..253fb42 100644</span><br><span>--- a/tests/apps/queues/macro_gosub_test/configs/ast1/queues.conf</span><br><span>+++ b/tests/apps/queues/gosub_test/configs/ast1/queues.conf</span><br><span>@@ -1,4 +1,3 @@</span><br><span> [test_queue]</span><br><span style="color: hsl(0, 100%, 40%);">-membermacro=primarymacro</span><br><span> membergosub=primarygosub</span><br><span> member => Local/answerer@test_context/n</span><br><span>diff --git a/tests/apps/queues/gosub_test/run-test b/tests/apps/queues/gosub_test/run-test</span><br><span>new file mode 100755</span><br><span>index 0000000..1b6319f</span><br><span>--- /dev/null</span><br><span>+++ b/tests/apps/queues/gosub_test/run-test</span><br><span>@@ -0,0 +1,4 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#!/usr/bin/env bash</span><br><span style="color: hsl(120, 100%, 40%);">+set -e</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+asttest -a /$AST_TEST_ROOT -s `dirname $0` $@</span><br><span>diff --git a/tests/apps/queues/macro_gosub_test/test-config.yaml b/tests/apps/queues/gosub_test/test-config.yaml</span><br><span>similarity index 71%</span><br><span>rename from tests/apps/queues/macro_gosub_test/test-config.yaml</span><br><span>rename to tests/apps/queues/gosub_test/test-config.yaml</span><br><span>index 17de102..dde49ed 100644</span><br><span>--- a/tests/apps/queues/macro_gosub_test/test-config.yaml</span><br><span>+++ b/tests/apps/queues/gosub_test/test-config.yaml</span><br><span>@@ -3,8 +3,8 @@</span><br><span> skip: 'Skip while failures are debugged'</span><br><span> description: |</span><br><span> 'This test runs two calls through a queue. The queue is configured to run</span><br><span style="color: hsl(0, 100%, 40%);">- a particular macro and gosub when a member answers. For the first call, we</span><br><span style="color: hsl(0, 100%, 40%);">- ensure that the configured membermacro and membergosub are executed. In the</span><br><span style="color: hsl(120, 100%, 40%);">+ a particular gosub when a member answers. For the first call, we</span><br><span style="color: hsl(120, 100%, 40%);">+ ensure that the configured membergosub are executed. In the</span><br><span> second call, we give overriding parameters to the Queue() application and</span><br><span> ensure that those are run instead.'</span><br><span> </span><br><span>@@ -12,6 +12,5 @@</span><br><span> dependencies:</span><br><span> - app: 'asttest'</span><br><span> tags:</span><br><span style="color: hsl(0, 100%, 40%);">- - macro</span><br><span> - gosub</span><br><span> - queues</span><br><span>diff --git a/tests/apps/queues/macro_gosub_test/test.lua b/tests/apps/queues/gosub_test/test.lua</span><br><span>similarity index 82%</span><br><span>rename from tests/apps/queues/macro_gosub_test/test.lua</span><br><span>rename to tests/apps/queues/gosub_test/test.lua</span><br><span>index b5fc58b..dd7810d 100644</span><br><span>--- a/tests/apps/queues/macro_gosub_test/test.lua</span><br><span>+++ b/tests/apps/queues/gosub_test/test.lua</span><br><span>@@ -21,11 +21,6 @@</span><br><span> end</span><br><span> </span><br><span> function primary(event)</span><br><span style="color: hsl(0, 100%, 40%);">- if event["Variable"] == "MACROVAR" then</span><br><span style="color: hsl(0, 100%, 40%);">- if event["Value"] == "primarymacro" then</span><br><span style="color: hsl(0, 100%, 40%);">- passmacro = true</span><br><span style="color: hsl(0, 100%, 40%);">- end</span><br><span style="color: hsl(0, 100%, 40%);">- end</span><br><span> if event["Variable"] == "GOSUBVAR" then</span><br><span> if event["Value"] == "primarygosub" then</span><br><span> passgosub = true</span><br><span>@@ -34,11 +29,6 @@</span><br><span> end</span><br><span> </span><br><span> function secondary(event)</span><br><span style="color: hsl(0, 100%, 40%);">- if event["Variable"] == "MACROVAR" then</span><br><span style="color: hsl(0, 100%, 40%);">- if event["Value"] == "secondarymacro" then</span><br><span style="color: hsl(0, 100%, 40%);">- passmacro = true</span><br><span style="color: hsl(0, 100%, 40%);">- end</span><br><span style="color: hsl(0, 100%, 40%);">- end</span><br><span> if event["Variable"] == "GOSUBVAR" then</span><br><span> if event["Value"] == "secondarygosub" then</span><br><span> passgosub = true</span><br><span>@@ -47,7 +37,6 @@</span><br><span> end</span><br><span> </span><br><span> function test_call(exten, man, handler)</span><br><span style="color: hsl(0, 100%, 40%);">- passmacro = false</span><br><span> passgosub = false</span><br><span> local orig = ast.manager.action:new("Originate")</span><br><span> man:register_event("VarSet", handler)</span><br><span>@@ -66,8 +55,8 @@</span><br><span> </span><br><span> --When the originate returns, we know that the member</span><br><span> --has answered the call, but we can't guarantee that</span><br><span style="color: hsl(0, 100%, 40%);">- --the macro or gosub has actually run, so sleep for a</span><br><span style="color: hsl(0, 100%, 40%);">- --sec for safety's sake</span><br><span style="color: hsl(120, 100%, 40%);">+ --the gosub has actually run, so sleep for a sec for</span><br><span style="color: hsl(120, 100%, 40%);">+ --safety's sake</span><br><span> posix.sleep(1)</span><br><span> res, err = man:pump_messages()</span><br><span> if not res then</span><br><span>@@ -77,10 +66,6 @@</span><br><span> man:process_events()</span><br><span> man:unregister_event("VarSet", handler)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if not passmacro then</span><br><span style="color: hsl(0, 100%, 40%);">- fail("Did not get expected macro variable set")</span><br><span style="color: hsl(0, 100%, 40%);">- end</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if not passgosub then</span><br><span> fail("Did not get expected gosub variable set")</span><br><span> end</span><br><span>diff --git a/tests/apps/queues/macro_gosub_test/configs/ast1/extensions.conf b/tests/apps/queues/macro_gosub_test/configs/ast1/extensions.conf</span><br><span>deleted file mode 100644</span><br><span>index 4152f87..0000000</span><br><span>--- a/tests/apps/queues/macro_gosub_test/configs/ast1/extensions.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,27 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[test_context]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => answerer,1,Answer</span><br><span style="color: hsl(0, 100%, 40%);">-exten => answerer,n,Wait(2)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => answerer,n,Hangup</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => test1,1,Queue(test_queue)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => test1,n,Hangup</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => test2,1,Queue(test_queue,,,,,,secondarymacro,secondarygosub)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => test2,n,Hangup</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[macro-primarymacro]</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,1,Set(MACROVAR=primarymacro)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,n,MacroExit</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[macro-secondarymacro]</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,1,Set(MACROVAR=secondarymacro)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,n,MacroExit</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[primarygosub]</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,1,Set(GOSUBVAR=primarygosub)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,n,Return</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[secondarygosub]</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,1,Set(GOSUBVAR=secondarygosub)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,n,Return</span><br><span>diff --git a/tests/apps/queues/macro_gosub_test/run-test b/tests/apps/queues/macro_gosub_test/run-test</span><br><span>deleted file mode 100755</span><br><span>index 553d75f..0000000</span><br><span>--- a/tests/apps/queues/macro_gosub_test/run-test</span><br><span>+++ /dev/null</span><br><span>@@ -1,4 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/usr/bin/env bash</span><br><span style="color: hsl(0, 100%, 40%);">-set -e</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-asttest -a /$AST_TEST_ROOT -s tests/queues/macro_gosub_test</span><br><span>diff --git a/tests/apps/queues/tests.yaml b/tests/apps/queues/tests.yaml</span><br><span>index e1c0d0c..6e8e4d1 100644</span><br><span>--- a/tests/apps/queues/tests.yaml</span><br><span>+++ b/tests/apps/queues/tests.yaml</span><br><span>@@ -10,7 +10,7 @@</span><br><span> - test: 'queue_no_answer'</span><br><span> - test: 'queue_one_paused_no_answer'</span><br><span> - test: 'queue_penalty_outside_range'</span><br><span style="color: hsl(0, 100%, 40%);">- - test: 'macro_gosub_test'</span><br><span style="color: hsl(120, 100%, 40%);">+ - test: 'gosub_test'</span><br><span> - test: 'ringinuse_and_pause'</span><br><span> - test: 'wrapup_time'</span><br><span> - test: 'wrapup_time_per_member'</span><br><span>diff --git a/tests/apps/tests.yaml b/tests/apps/tests.yaml</span><br><span>index f74ba8e..19797b0 100644</span><br><span>--- a/tests/apps/tests.yaml</span><br><span>+++ b/tests/apps/tests.yaml</span><br><span>@@ -12,7 +12,6 @@</span><br><span> - dir: 'chanspy'</span><br><span> - dir: 'queues'</span><br><span> - dir: 'directed_pickup'</span><br><span style="color: hsl(0, 100%, 40%);">- - dir: 'macro'</span><br><span> - test: 'mixmonitor'</span><br><span> - test: 'mixmonitor_rxtx'</span><br><span> - test: 'mixmonitor_audiohook_inherit'</span><br><span>diff --git a/tests/cdr/cdr_dial_subroutines/configs/ast1/extensions.conf b/tests/cdr/cdr_dial_subroutines/configs/ast1/extensions.conf</span><br><span>index 6302506..6cbb01a 100644</span><br><span>--- a/tests/cdr/cdr_dial_subroutines/configs/ast1/extensions.conf</span><br><span>+++ b/tests/cdr/cdr_dial_subroutines/configs/ast1/extensions.conf</span><br><span>@@ -10,18 +10,18 @@</span><br><span> same => n,GoSub(subroutines,dialer_2000,1)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-; Use a macro to dial 4000</span><br><span style="color: hsl(120, 100%, 40%);">+; Use a subroutine to dial 4000</span><br><span> exten => 3000,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Macro(dialer_3000)</span><br><span style="color: hsl(120, 100%, 40%);">+ same => n,GoSub(subroutines,dialer_3000,1)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-; Use a subroutine => macro => subroutine to dial 5000</span><br><span style="color: hsl(120, 100%, 40%);">+; Use a subroutine => subroutine to dial 5000</span><br><span> exten => 4000,1,NoOp()</span><br><span> same => n,Wait(1)</span><br><span> same => n,GoSub(subroutines,dialer_4000,1)</span><br><span> same => n,Hangup()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-; Called from the macro that dials 4000 as well</span><br><span style="color: hsl(120, 100%, 40%);">+; Called from the subroutine that dials 4000 as well</span><br><span> exten => 4001,1,NoOp()</span><br><span> same => n,Busy()</span><br><span> same => n,Hangup()</span><br><span>@@ -38,21 +38,15 @@</span><br><span> same => n,Dial(Local/3000@default/n)</span><br><span> same => n,Return()</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+; Perform a parallel dial to 4000</span><br><span style="color: hsl(120, 100%, 40%);">+exten => dialer_3000,1,NoOp()</span><br><span style="color: hsl(120, 100%, 40%);">+ same => n,Dial(Local/4000@default/n&Local/4001@default/n)</span><br><span style="color: hsl(120, 100%, 40%);">+ same => n,(end),Return</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> exten => dialer_4000,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Macro(dialer_4000)</span><br><span style="color: hsl(120, 100%, 40%);">+ same => n,GoSub(subroutines,dialer_4000_bounce_back,1)</span><br><span> same => n,Return()</span><br><span> </span><br><span> exten => dialer_4000_bounce_back,1,NoOp()</span><br><span> same => n,Dial(Local/5000@default/n)</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Return()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[macro-dialer_3000]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-; Perform a parallel dial to 4000</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,Dial(Local/4000@default/n&Local/4001@default/n)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[macro-dialer_4000]</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,1,NoOp()</span><br><span style="color: hsl(0, 100%, 40%);">- same => n,GoSub(subroutines,dialer_4000_bounce_back,1)</span><br><span style="color: hsl(120, 100%, 40%);">+ same => n,Return()</span><br><span>\ No newline at end of file</span><br><span>diff --git a/tests/cdr/cdr_dial_subroutines/test-config.yaml b/tests/cdr/cdr_dial_subroutines/test-config.yaml</span><br><span>index 7bddedd..e686b61 100644</span><br><span>--- a/tests/cdr/cdr_dial_subroutines/test-config.yaml</span><br><span>+++ b/tests/cdr/cdr_dial_subroutines/test-config.yaml</span><br><span>@@ -111,7 +111,6 @@</span><br><span> - asterisk : 'cdr_csv'</span><br><span> - asterisk : 'app_dial'</span><br><span> - asterisk : 'app_echo'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk : 'app_macro'</span><br><span> - asterisk : 'app_playback'</span><br><span> - asterisk : 'app_stack'</span><br><span> tags:</span><br><span>diff --git a/tests/connected_line/macro/configs/ast1/extensions.conf b/tests/connected_line/macro/configs/ast1/extensions.conf</span><br><span>deleted file mode 100644</span><br><span>index 9381e3b..0000000</span><br><span>--- a/tests/connected_line/macro/configs/ast1/extensions.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,26 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[test]</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 100,1,NoOp</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 100,n,Set(__CONNECTED_LINE_CALLER_SEND_MACRO=caller)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 100,n,Set(__CONNECTED_LINE_CALLER_SEND_MACRO_ARGS=45,4)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 100,n,Dial(local/101@test)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 100,n,Hangup</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 101,1,NoOp</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 101,n,Set(CONNECTEDLINE(name,i)="Company Name")</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 101,n,Set(CONNECTEDLINE(name-pres,i)=allowed)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 101,n,Set(CONNECTEDLINE(num,i)=5551212)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 101,n,Set(CONNECTEDLINE(num-pres)=allowed)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 101,n,Answer</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 101,n,Echo()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[macro-caller]</span><br><span style="color: hsl(0, 100%, 40%);">-; ARG1 is the prefix to add.</span><br><span style="color: hsl(0, 100%, 40%);">-; ARG2 is the number of digits at the end to add the prefix to.</span><br><span style="color: hsl(0, 100%, 40%);">-; When the macro ends the CONNECTEDLINE data is passed to the</span><br><span style="color: hsl(0, 100%, 40%);">-; channel driver.</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,1,NoOp(Add prefix to connected line, macro edition)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,n,GotoIf($[${CONNECTEDLINE(number)} != 5551212]?end)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,n,UserEvent(CLStatus,status: caller connected line macro,arg1: ${ARG1},arg2: ${ARG2})</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,n,Set(NOPREFIX=${CONNECTEDLINE(number):-${ARG2}})</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,n,Set(CONNECTEDLINE(num,i)=${ARG1}${NOPREFIX})</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,(end),MacroExit</span><br><span>diff --git a/tests/connected_line/macro/run-test b/tests/connected_line/macro/run-test</span><br><span>deleted file mode 100755</span><br><span>index 611dde4..0000000</span><br><span>--- a/tests/connected_line/macro/run-test</span><br><span>+++ /dev/null</span><br><span>@@ -1,46 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/usr/bin/env python</span><br><span style="color: hsl(0, 100%, 40%);">-'''</span><br><span style="color: hsl(0, 100%, 40%);">-Copyright (C) 2012, Digium, Inc.</span><br><span style="color: hsl(0, 100%, 40%);">-Kinsey Moore <kmoore@digium.com></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-This program is free software, distributed under the terms of</span><br><span style="color: hsl(0, 100%, 40%);">-the GNU General Public License Version 2.</span><br><span style="color: hsl(0, 100%, 40%);">-'''</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-import sys</span><br><span style="color: hsl(0, 100%, 40%);">-import logging</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-sys.path.append("lib/python")</span><br><span style="color: hsl(0, 100%, 40%);">-from asterisk.test_case import SimpleTestCase</span><br><span style="color: hsl(0, 100%, 40%);">-from twisted.internet import reactor</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-LOGGER = logging.getLogger(__name__)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-class ConnectedLineTest(SimpleTestCase):</span><br><span style="color: hsl(0, 100%, 40%);">- def verify_event(self, event):</span><br><span style="color: hsl(0, 100%, 40%);">- if event['userevent'] != 'CLStatus':</span><br><span style="color: hsl(0, 100%, 40%);">- return False</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if event['arg1'] != '45':</span><br><span style="color: hsl(0, 100%, 40%);">- return False</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if event['arg2'] != '4':</span><br><span style="color: hsl(0, 100%, 40%);">- return False</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOGGER.info("Got connected line event")</span><br><span style="color: hsl(0, 100%, 40%);">- return True</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-def main():</span><br><span style="color: hsl(0, 100%, 40%);">- test = ConnectedLineTest()</span><br><span style="color: hsl(0, 100%, 40%);">- test.start_asterisk()</span><br><span style="color: hsl(0, 100%, 40%);">- reactor.run()</span><br><span style="color: hsl(0, 100%, 40%);">- test.stop_asterisk()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if not test.passed:</span><br><span style="color: hsl(0, 100%, 40%);">- return 1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-if __name__ == "__main__":</span><br><span style="color: hsl(0, 100%, 40%);">- sys.exit(main() or 0)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/connected_line/macro/test-config.yaml b/tests/connected_line/macro/test-config.yaml</span><br><span>deleted file mode 100644</span><br><span>index 0f542c6..0000000</span><br><span>--- a/tests/connected_line/macro/test-config.yaml</span><br><span>+++ /dev/null</span><br><span>@@ -1,16 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-testinfo:</span><br><span style="color: hsl(0, 100%, 40%);">- summary: 'Test connected line macro execution.'</span><br><span style="color: hsl(0, 100%, 40%);">- description: 'Ensures that the macro execution for connected line executes as expected and receives its arguments properly. This verifies functional usage of the following variables: CONNECTED_LINE_CALLEE_SEND_MACRO, CONNECTED_LINE_CALLEE_SEND_MACRO_ARGS, CONNECTED_LINE_CALLER_SEND_MACRO, CONNECTED_LINE_CALLER_SEND_MACRO_ARGS'</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-properties:</span><br><span style="color: hsl(0, 100%, 40%);">- dependencies:</span><br><span style="color: hsl(0, 100%, 40%);">- - python : 'twisted'</span><br><span style="color: hsl(0, 100%, 40%);">- - python : 'starpy'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'app_dial'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'app_echo'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'app_macro'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'app_userevent'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'func_callerid'</span><br><span style="color: hsl(0, 100%, 40%);">- tags:</span><br><span style="color: hsl(0, 100%, 40%);">- - connected_line</span><br><span style="color: hsl(0, 100%, 40%);">- - macro</span><br><span>diff --git a/tests/connected_line/tests.yaml b/tests/connected_line/tests.yaml</span><br><span>index 3da1d12..74fe22d 100644</span><br><span>--- a/tests/connected_line/tests.yaml</span><br><span>+++ b/tests/connected_line/tests.yaml</span><br><span>@@ -1,5 +1,4 @@</span><br><span> # Enter tests here in the order they should be considered for execution:</span><br><span> tests:</span><br><span style="color: hsl(0, 100%, 40%);">- - test: 'macro'</span><br><span> - test: 'subroutine'</span><br><span> </span><br><span>diff --git a/tests/redirecting/macro/configs/ast1/extensions.conf b/tests/redirecting/macro/configs/ast1/extensions.conf</span><br><span>deleted file mode 100644</span><br><span>index ff427e2..0000000</span><br><span>--- a/tests/redirecting/macro/configs/ast1/extensions.conf</span><br><span>+++ /dev/null</span><br><span>@@ -1,28 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-[test]</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 100,1,NoOp</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 100,n,Set(__REDIRECTING_CALLER_SEND_MACRO=caller)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 100,n,Set(__REDIRECTING_CALLER_SEND_MACRO_ARGS=45,4)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 100,n,Dial(local/101@test)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 100,n,Hangup</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 101,1,NoOp</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 101,n,Set(REDIRECTING(to-num,i)=2000)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 101,n,Set(REDIRECTING(to-num-pres)=allowed)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 101,n,Set(REDIRECTING(from-num,i)=1000)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 101,n,Set(REDIRECTING(from-num-pres,i)=allowed)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 101,n,Set(REDIRECTING(count,i)=$[${REDIRECTING(count)} + 1])</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 101,n,Set(REDIRECTING(reason,i)=cfu)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 101,n,Answer</span><br><span style="color: hsl(0, 100%, 40%);">-exten => 101,n,Echo()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-[macro-caller]</span><br><span style="color: hsl(0, 100%, 40%);">-; ARG1 is the prefix to add.</span><br><span style="color: hsl(0, 100%, 40%);">-; ARG2 is the number of digits at the end to add the prefix to.</span><br><span style="color: hsl(0, 100%, 40%);">-; When the macro ends the REDIRECTING data is passed to the</span><br><span style="color: hsl(0, 100%, 40%);">-; channel driver.</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,1,NoOp(Add prefix to redirecting to-num, macro edition)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,n,GotoIf($[${REDIRECTING(to-num)} != 2000]?end)</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,n,UserEvent(RStatus,status: caller redirecting macro,arg1: ${ARG1},arg2: ${ARG2})</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,n,Set(NOPREFIX=${REDIRECTING(to-num):-${ARG2}})</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,n,Set(REDIRECTING(to-num,i)=${ARG1}${NOPREFIX})</span><br><span style="color: hsl(0, 100%, 40%);">-exten => s,(end),MacroExit</span><br><span>diff --git a/tests/redirecting/macro/run-test b/tests/redirecting/macro/run-test</span><br><span>deleted file mode 100755</span><br><span>index c29c5b1..0000000</span><br><span>--- a/tests/redirecting/macro/run-test</span><br><span>+++ /dev/null</span><br><span>@@ -1,46 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/usr/bin/env python</span><br><span style="color: hsl(0, 100%, 40%);">-'''</span><br><span style="color: hsl(0, 100%, 40%);">-Copyright (C) 2012, Digium, Inc.</span><br><span style="color: hsl(0, 100%, 40%);">-Kinsey Moore <kmoore@digium.com></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-This program is free software, distributed under the terms of</span><br><span style="color: hsl(0, 100%, 40%);">-the GNU General Public License Version 2.</span><br><span style="color: hsl(0, 100%, 40%);">-'''</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-import sys</span><br><span style="color: hsl(0, 100%, 40%);">-import logging</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-sys.path.append("lib/python")</span><br><span style="color: hsl(0, 100%, 40%);">-from asterisk.test_case import SimpleTestCase</span><br><span style="color: hsl(0, 100%, 40%);">-from twisted.internet import reactor</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-LOGGER = logging.getLogger(__name__)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-class RedirectingTest(SimpleTestCase):</span><br><span style="color: hsl(0, 100%, 40%);">- def verify_event(self, event):</span><br><span style="color: hsl(0, 100%, 40%);">- if event['userevent'] != 'RStatus':</span><br><span style="color: hsl(0, 100%, 40%);">- return False</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if event['arg1'] != '45':</span><br><span style="color: hsl(0, 100%, 40%);">- return False</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if event['arg2'] != '4':</span><br><span style="color: hsl(0, 100%, 40%);">- return False</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOGGER.info("Got redirecting event")</span><br><span style="color: hsl(0, 100%, 40%);">- return True</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-def main():</span><br><span style="color: hsl(0, 100%, 40%);">- test = RedirectingTest()</span><br><span style="color: hsl(0, 100%, 40%);">- test.start_asterisk()</span><br><span style="color: hsl(0, 100%, 40%);">- reactor.run()</span><br><span style="color: hsl(0, 100%, 40%);">- test.stop_asterisk()</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if not test.passed:</span><br><span style="color: hsl(0, 100%, 40%);">- return 1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-if __name__ == "__main__":</span><br><span style="color: hsl(0, 100%, 40%);">- sys.exit(main() or 0)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/redirecting/macro/test-config.yaml b/tests/redirecting/macro/test-config.yaml</span><br><span>deleted file mode 100644</span><br><span>index 91d6af1..0000000</span><br><span>--- a/tests/redirecting/macro/test-config.yaml</span><br><span>+++ /dev/null</span><br><span>@@ -1,16 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-testinfo:</span><br><span style="color: hsl(0, 100%, 40%);">- summary: 'Test redirecting macro execution.'</span><br><span style="color: hsl(0, 100%, 40%);">- description: 'Ensures that the macro execution for redirecting executes as expected and receives its arguments properly. This verifies functional usage of the following variables: REDIRECTING_CALLER_SEND_MACRO, REDIRECTING_CALLER_SEND_MACRO_ARGS'</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-properties:</span><br><span style="color: hsl(0, 100%, 40%);">- dependencies:</span><br><span style="color: hsl(0, 100%, 40%);">- - python : 'twisted'</span><br><span style="color: hsl(0, 100%, 40%);">- - python : 'starpy'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'app_dial'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'app_echo'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'app_macro'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'app_userevent'</span><br><span style="color: hsl(0, 100%, 40%);">- - asterisk: 'func_callerid'</span><br><span style="color: hsl(0, 100%, 40%);">- tags:</span><br><span style="color: hsl(0, 100%, 40%);">- - redirecting</span><br><span style="color: hsl(0, 100%, 40%);">- - macro</span><br><span>diff --git a/tests/redirecting/tests.yaml b/tests/redirecting/tests.yaml</span><br><span>index bf4b498..b1da227 100644</span><br><span>--- a/tests/redirecting/tests.yaml</span><br><span>+++ b/tests/redirecting/tests.yaml</span><br><span>@@ -1,6 +1,5 @@</span><br><span> # Enter tests here in the order they should be considered for execution:</span><br><span> tests:</span><br><span> - test: 'forwardername'</span><br><span style="color: hsl(0, 100%, 40%);">- - test: 'macro'</span><br><span> - test: 'subroutine'</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/testsuite/+/19789">change 19789</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/testsuite/+/19789"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: testsuite </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I059a79f1c680267c68b4ecb98347ddcc48084420 </div>
<div style="display:none"> Gerrit-Change-Number: 19789 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Michael Bradeen <mbradeen@sangoma.com> </div>
<div style="display:none"> Gerrit-Reviewer: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-Reviewer: N A <asterisk@phreaknet.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>