[Asterisk-code-review] apps/dial: Convert to use chan pjsip (testsuite[master])
Jenkins2
asteriskteam at digium.com
Wed Jun 13 14:18:20 CDT 2018
Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/9135 )
Change subject: apps/dial: Convert to use chan_pjsip
......................................................................
apps/dial: Convert to use chan_pjsip
The sip_to_pjsip script took care of the sip.conf to pjsip.conf
conversion but there were other issues.
The regex in sipp.xml files to capture the to tag was wrong.
"s" now gets returned as ConnectedLineNum in many cases.
"NO ANSWER" now gets returned as a dial status when the remote
end doesn't answer instead of "BUSY"
This commit is dependent on the mainline asterisk commit...
"chan_pjsip: Register for "BEFORE_MEDIA" responses"
Change-Id: If176aff9ca48a9e7037514c202b83b270eb52537
---
M tests/apps/dial/dial_answer/sipp/charlie.xml
M tests/apps/dial/dial_answer/test-config.yaml
M tests/apps/dial/dial_busy/test-config.yaml
M tests/apps/dial/dial_congestion/test-config.yaml
M tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml
M tests/apps/dial/dial_hangup/test-config.yaml
M tests/apps/dial/dial_no_answer/test-config.yaml
M tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml
M tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml
M tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml
M tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml
M tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml
M tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/bob.xml
M tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/charlie.xml
M tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml
M tests/apps/dial/dial_parallel/dial_parallel_answer_cancel_cause/sipp/bob.xml
M tests/apps/dial/dial_parallel/dial_parallel_answer_cancel_cause/sipp/charlie.xml
M tests/apps/dial/dial_parallel/dial_parallel_single_busy/sipp/charlie.xml
M tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml
M tests/apps/dial/dial_parallel/dial_parallel_single_congestion/sipp/charlie.xml
M tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml
M tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/sipp/charlie.xml
M tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml
M tests/apps/dial/dial_parallel/dial_parallel_single_unavail/sipp/charlie.xml
M tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml
M tests/apps/dial/dial_timeout/test-config.yaml
M tests/apps/dial/dial_unavail/test-config.yaml
27 files changed, 55 insertions(+), 55 deletions(-)
Approvals:
Kevin Harwell: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, but someone else must approve
Richard Mudgett: Looks good to me, approved
Jenkins2: Approved for Submit
diff --git a/tests/apps/dial/dial_answer/sipp/charlie.xml b/tests/apps/dial/dial_answer/sipp/charlie.xml
index cc2d8aa..5b52c4e 100644
--- a/tests/apps/dial/dial_answer/sipp/charlie.xml
+++ b/tests/apps/dial/dial_answer/sipp/charlie.xml
@@ -24,7 +24,7 @@
<recv request="INVITE" crlf="true">
<!-- Save the from tag. We'll need it when we send our BYE -->
<action>
- <ereg regexp=".*(;tag=.*)"
+ <ereg regexp="(;tag=.*)"
header="From:"
search_in="hdr"
check_it="true"
diff --git a/tests/apps/dial/dial_answer/test-config.yaml b/tests/apps/dial/dial_answer/test-config.yaml
index 191156d..e2b21ca 100644
--- a/tests/apps/dial/dial_answer/test-config.yaml
+++ b/tests/apps/dial/dial_answer/test-config.yaml
@@ -19,7 +19,7 @@
- asterisk : 'func_strings'
- asterisk : 'pbx_config'
tags:
- - SIP
+ - pjsip
- dial
- CDR
@@ -44,19 +44,19 @@
destination: 's'
dcontext: 'default'
callerid: '"" <>'
- channel: 'Local/s at default-.{8};1'
- dchannel: ''
- lastapp: 'Echo'
+ channel: 'Local/s at default-.{8};2'
+ dchannel: 'PJSIP/charlie-.{8}'
+ lastapp: 'Dial'
disposition: 'ANSWERED'
amaflags: 'DOCUMENTATION'
-
accountcode: ''
destination: 's'
dcontext: 'default'
- callerid: '"" <>'
- channel: 'Local/s at default-.{8};2'
- dchannel: 'PJSIP/charlie-.{8}'
- lastapp: 'Dial'
+ callerid: '"" <s>'
+ channel: 'Local/s at default-.{8};1'
+ dchannel: ''
+ lastapp: 'Echo'
disposition: 'ANSWERED'
amaflags: 'DOCUMENTATION'
diff --git a/tests/apps/dial/dial_busy/test-config.yaml b/tests/apps/dial/dial_busy/test-config.yaml
index ffa7b16..40a1064 100644
--- a/tests/apps/dial/dial_busy/test-config.yaml
+++ b/tests/apps/dial/dial_busy/test-config.yaml
@@ -19,7 +19,7 @@
- asterisk : 'func_strings'
- asterisk : 'pbx_config'
tags:
- - SIP
+ - pjsip
- dial
- CDR
@@ -103,7 +103,7 @@
DestLinkedid: '.*'
CallerIDNum: '<unknown>'
CallerIDName: '<unknown>'
- ConnectedLineNum: '<unknown>'
+ ConnectedLineNum: 's'
ConnectedLineName: '<unknown>'
DialStatus: 'BUSY'
count: '1'
diff --git a/tests/apps/dial/dial_congestion/test-config.yaml b/tests/apps/dial/dial_congestion/test-config.yaml
index c493481..69aab93 100644
--- a/tests/apps/dial/dial_congestion/test-config.yaml
+++ b/tests/apps/dial/dial_congestion/test-config.yaml
@@ -18,7 +18,7 @@
- asterisk : 'func_strings'
- asterisk : 'pbx_config'
tags:
- - SIP
+ - pjsip
- dial
- CDR
@@ -95,7 +95,7 @@
DestUniqueid: '.*'
CallerIDNum: '<unknown>'
CallerIDName: '<unknown>'
- ConnectedLineNum: '<unknown>'
+ ConnectedLineNum: 's'
ConnectedLineName: '<unknown>'
DialStatus: 'CONGESTION'
count: '1'
diff --git a/tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml b/tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml
index 43a0ebd..f7398d4 100644
--- a/tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml
+++ b/tests/apps/dial/dial_dtmf_hangup_cancel/test-config.yaml
@@ -20,7 +20,7 @@
- asterisk : 'func_hangupcause'
- asterisk : 'pbx_config'
tags:
- - SIP
+ - pjsip
- dial
- CDR
@@ -89,7 +89,7 @@
DestUniqueid: '.*'
CallerIDNum: '<unknown>'
CallerIDName: '<unknown>'
- ConnectedLineNum: '<unknown>'
+ ConnectedLineNum: 's'
ConnectedLineName: '<unknown>'
DialStatus: 'CANCEL'
count: '1'
diff --git a/tests/apps/dial/dial_hangup/test-config.yaml b/tests/apps/dial/dial_hangup/test-config.yaml
index f10eb55..8fe20a2 100644
--- a/tests/apps/dial/dial_hangup/test-config.yaml
+++ b/tests/apps/dial/dial_hangup/test-config.yaml
@@ -19,7 +19,7 @@
- asterisk : 'func_strings'
- asterisk : 'pbx_config'
tags:
- - SIP
+ - pjsip
- dial
- CDR
@@ -88,7 +88,7 @@
DestUniqueid: '.*'
CallerIDNum: '<unknown>'
CallerIDName: '<unknown>'
- ConnectedLineNum: '<unknown>'
+ ConnectedLineNum: 's'
ConnectedLineName: '<unknown>'
DialStatus: 'CANCEL'
count: '1'
diff --git a/tests/apps/dial/dial_no_answer/test-config.yaml b/tests/apps/dial/dial_no_answer/test-config.yaml
index 4a8b103..1e31b11 100644
--- a/tests/apps/dial/dial_no_answer/test-config.yaml
+++ b/tests/apps/dial/dial_no_answer/test-config.yaml
@@ -18,7 +18,7 @@
- asterisk : 'func_strings'
- asterisk : 'pbx_config'
tags:
- - SIP
+ - pjsip
- dial
- CDR
@@ -49,7 +49,7 @@
channel: 'Local/s at default-.{8};2'
dchannel: 'PJSIP/bob-.{8}'
lastapp: 'Dial'
- disposition: 'BUSY'
+ disposition: 'NO ANSWER'
amaflags: 'DOCUMENTATION'
ami-config-12:
@@ -95,9 +95,9 @@
DestUniqueid: '.*'
CallerIDNum: '<unknown>'
CallerIDName: '<unknown>'
- ConnectedLineNum: '<unknown>'
+ ConnectedLineNum: 's'
ConnectedLineName: '<unknown>'
- DialStatus: 'BUSY'
+ DialStatus: 'NOANSWER'
count: '1'
originator-config:
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml
index 4877881..2e304c2 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml
@@ -18,7 +18,7 @@
- asterisk : 'func_strings'
- asterisk : 'pbx_config'
tags:
- - SIP
+ - pjsip
- dial
- CDR
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml
index 01b3d6d..645a43a 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml
@@ -21,7 +21,7 @@
- asterisk : 'func_strings'
- asterisk : 'pbx_config'
tags:
- - SIP
+ - pjsip
- dial
- CDR
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml
index 1b3c8a9..f11f3db 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml
@@ -18,7 +18,7 @@
- asterisk : 'func_strings'
- asterisk : 'pbx_config'
tags:
- - SIP
+ - pjsip
- dial
- CDR
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml
index 6e465ac..335adbe 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml
@@ -18,7 +18,7 @@
- asterisk : 'func_strings'
- asterisk : 'pbx_config'
tags:
- - SIP
+ - pjsip
- dial
- CDR
@@ -49,7 +49,7 @@
channel: 'Local/s at default-.{8};2'
dchannel: 'PJSIP/bob-.{8}'
lastapp: 'Dial'
- disposition: 'BUSY'
+ disposition: 'NO ANSWER'
amaflags: 'DOCUMENTATION'
-
accountcode: ''
@@ -59,7 +59,7 @@
channel: 'Local/s at default-.{8};2'
dchannel: 'PJSIP/charlie-.{8}'
lastapp: 'Dial'
- disposition: 'BUSY'
+ disposition: 'NO ANSWER'
amaflags: 'DOCUMENTATION'
ami-config-12:
@@ -130,7 +130,7 @@
CallerIDName: '<unknown>'
ConnectedLineNum: '<unknown>'
ConnectedLineName: '<unknown>'
- DialStatus: 'BUSY'
+ DialStatus: 'NOANSWER'
count: '1'
-
type: 'headermatch'
@@ -145,7 +145,7 @@
CallerIDName: '<unknown>'
ConnectedLineNum: '<unknown>'
ConnectedLineName: '<unknown>'
- DialStatus: 'BUSY'
+ DialStatus: 'NOANSWER'
count: '1'
originator-config:
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml
index a79b675..4c5d7da 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml
@@ -18,7 +18,7 @@
- asterisk : 'func_strings'
- asterisk : 'pbx_config'
tags:
- - SIP
+ - pjsip
- dial
- CDR
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/bob.xml b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/bob.xml
index b10524a..ab5fe6e 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/bob.xml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/bob.xml
@@ -5,7 +5,7 @@
<recv request="INVITE" crlf="true">
<!-- Save the from tag. We'll need it when we send our response -->
<action>
- <ereg regexp=".*(;tag=.*)"
+ <ereg regexp="(;tag=.*)"
header="From:"
search_in="hdr"
check_it="true"
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/charlie.xml b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/charlie.xml
index cfc4739..39aacda 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/charlie.xml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/charlie.xml
@@ -24,7 +24,7 @@
<recv request="INVITE" crlf="true">
<!-- Save the from tag. We'll need it when we send our BYE -->
<action>
- <ereg regexp=".*(;tag=.*)"
+ <ereg regexp="(;tag=.*)"
header="From:"
search_in="hdr"
check_it="true"
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml
index 4752971..1ea7232 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml
@@ -21,7 +21,7 @@
- asterisk : 'func_strings'
- asterisk : 'pbx_config'
tags:
- - SIP
+ - pjsip
- dial
- CDR
@@ -146,7 +146,7 @@
DestLinkedid: '.*'
CallerIDNum: '<unknown>'
CallerIDName: '<unknown>'
- ConnectedLineNum: '<unknown>'
+ ConnectedLineNum: 's'
ConnectedLineName: '<unknown>'
DialStatus: 'CANCEL'
count: '1'
@@ -165,7 +165,7 @@
DestLinkedid: '.*'
CallerIDNum: '<unknown>'
CallerIDName: '<unknown>'
- ConnectedLineNum: '<unknown>'
+ ConnectedLineNum: 's'
ConnectedLineName: '<unknown>'
DialStatus: 'ANSWER'
count: '1'
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel_cause/sipp/bob.xml b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel_cause/sipp/bob.xml
index 9874415..81be64e 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel_cause/sipp/bob.xml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel_cause/sipp/bob.xml
@@ -5,7 +5,7 @@
<recv request="INVITE" crlf="true">
<!-- Save the from tag. We'll need it when we send our response -->
<action>
- <ereg regexp=".*(;tag=.*)" header="From:" search_in="hdr"
+ <ereg regexp="(;tag=.*)" header="From:" search_in="hdr"
check_it="true" assign_to="remote_tag" />
</action>
</recv>
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel_cause/sipp/charlie.xml b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel_cause/sipp/charlie.xml
index a0dedab..aa11595 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel_cause/sipp/charlie.xml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel_cause/sipp/charlie.xml
@@ -6,7 +6,7 @@
<recv request="INVITE" crlf="true">
<!-- Save the from tag. We'll need it when we send our BYE -->
<action>
- <ereg regexp=".*(;tag=.*)" header="From:" search_in="hdr"
+ <ereg regexp="(;tag=.*)" header="From:" search_in="hdr"
check_it="true" assign_to="dummy,remote_tag" />
</action>
</recv>
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_busy/sipp/charlie.xml b/tests/apps/dial/dial_parallel/dial_parallel_single_busy/sipp/charlie.xml
index cfc4739..39aacda 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_single_busy/sipp/charlie.xml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_busy/sipp/charlie.xml
@@ -24,7 +24,7 @@
<recv request="INVITE" crlf="true">
<!-- Save the from tag. We'll need it when we send our BYE -->
<action>
- <ereg regexp=".*(;tag=.*)"
+ <ereg regexp="(;tag=.*)"
header="From:"
search_in="hdr"
check_it="true"
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml
index 93e5439..c294a78 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml
@@ -19,7 +19,7 @@
- asterisk : 'func_strings'
- asterisk : 'pbx_config'
tags:
- - SIP
+ - pjsip
- dial
- CDR
@@ -144,7 +144,7 @@
Channel: 'Local/s at default-.*'
CallerIDNum: '<unknown>'
CallerIDName: '<unknown>'
- ConnectedLineNum: '<unknown>'
+ ConnectedLineNum: 's'
ConnectedLineName: '<unknown>'
DialStatus: 'ANSWER'
count: '1'
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/sipp/charlie.xml b/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/sipp/charlie.xml
index cfc4739..39aacda 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/sipp/charlie.xml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/sipp/charlie.xml
@@ -24,7 +24,7 @@
<recv request="INVITE" crlf="true">
<!-- Save the from tag. We'll need it when we send our BYE -->
<action>
- <ereg regexp=".*(;tag=.*)"
+ <ereg regexp="(;tag=.*)"
header="From:"
search_in="hdr"
check_it="true"
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml
index 0c2d5c6..1718d0b 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml
@@ -19,7 +19,7 @@
- asterisk : 'func_strings'
- asterisk : 'pbx_config'
tags:
- - SIP
+ - pjsip
- dial
- CDR
@@ -144,7 +144,7 @@
Channel: 'Local/s at default-.*'
CallerIDNum: '<unknown>'
CallerIDName: '<unknown>'
- ConnectedLineNum: '<unknown>'
+ ConnectedLineNum: 's'
ConnectedLineName: '<unknown>'
DialStatus: 'ANSWER'
count: '1'
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/sipp/charlie.xml b/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/sipp/charlie.xml
index cfc4739..39aacda 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/sipp/charlie.xml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/sipp/charlie.xml
@@ -24,7 +24,7 @@
<recv request="INVITE" crlf="true">
<!-- Save the from tag. We'll need it when we send our BYE -->
<action>
- <ereg regexp=".*(;tag=.*)"
+ <ereg regexp="(;tag=.*)"
header="From:"
search_in="hdr"
check_it="true"
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml
index d7118c5..eda94af 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml
@@ -20,7 +20,7 @@
- asterisk : 'func_strings'
- asterisk : 'pbx_config'
tags:
- - SIP
+ - pjsip
- dial
- CDR
@@ -51,7 +51,7 @@
channel: 'Local/s at default-.{8};2'
dchannel: 'PJSIP/bob-.{8}'
lastapp: 'Dial'
- disposition: 'BUSY'
+ disposition: 'NO ANSWER'
amaflags: 'DOCUMENTATION'
-
accountcode: ''
@@ -132,7 +132,7 @@
CallerIDName: '<unknown>'
ConnectedLineNum: '<unknown>'
ConnectedLineName: '<unknown>'
- DialStatus: 'BUSY'
+ DialStatus: 'NOANSWER'
count: '1'
-
type: 'headermatch'
@@ -145,7 +145,7 @@
Channel: 'Local/s at default-.*'
CallerIDNum: '<unknown>'
CallerIDName: '<unknown>'
- ConnectedLineNum: '<unknown>'
+ ConnectedLineNum: 's'
ConnectedLineName: '<unknown>'
DialStatus: 'ANSWER'
count: '1'
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/sipp/charlie.xml b/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/sipp/charlie.xml
index 7ccface..875dc1a 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/sipp/charlie.xml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/sipp/charlie.xml
@@ -24,7 +24,7 @@
<recv request="INVITE" crlf="true">
<!-- Save the from tag. We'll need it when we send our BYE -->
<action>
- <ereg regexp=".*(;tag=.*)"
+ <ereg regexp="(;tag=.*)"
header="From:"
search_in="hdr"
check_it="true"
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml
index deb08f1..00ef2e2 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml
@@ -19,7 +19,7 @@
- asterisk : 'func_strings'
- asterisk : 'pbx_config'
tags:
- - SIP
+ - pjsip
- dial
- CDR
@@ -144,7 +144,7 @@
Channel: 'Local/s at default-.*'
CallerIDNum: '<unknown>'
CallerIDName: '<unknown>'
- ConnectedLineNum: '<unknown>'
+ ConnectedLineNum: 's'
ConnectedLineName: '<unknown>'
DialStatus: 'ANSWER'
count: '1'
diff --git a/tests/apps/dial/dial_timeout/test-config.yaml b/tests/apps/dial/dial_timeout/test-config.yaml
index d4a3459..512953a 100644
--- a/tests/apps/dial/dial_timeout/test-config.yaml
+++ b/tests/apps/dial/dial_timeout/test-config.yaml
@@ -19,7 +19,7 @@
- asterisk : 'func_strings'
- asterisk : 'pbx_config'
tags:
- - SIP
+ - pjsip
- dial
- CDR
@@ -79,7 +79,7 @@
DestUniqueid: '.*'
CallerIDNum: '<unknown>'
CallerIDName: '<unknown>'
- ConnectedLineNum: '<unknown>'
+ ConnectedLineNum: 's'
ConnectedLineName: '<unknown>'
DialStatus: 'NOANSWER'
count: '1'
diff --git a/tests/apps/dial/dial_unavail/test-config.yaml b/tests/apps/dial/dial_unavail/test-config.yaml
index 1ab86e1..ccbe5ba 100644
--- a/tests/apps/dial/dial_unavail/test-config.yaml
+++ b/tests/apps/dial/dial_unavail/test-config.yaml
@@ -18,7 +18,7 @@
- asterisk : 'func_strings'
- asterisk : 'pbx_config'
tags:
- - SIP
+ - pjsip
- dial
- CDR
@@ -95,7 +95,7 @@
DestUniqueid: '.*'
CallerIDNum: '<unknown>'
CallerIDName: '<unknown>'
- ConnectedLineNum: '<unknown>'
+ ConnectedLineNum: 's'
ConnectedLineName: '<unknown>'
DialStatus: 'CHANUNAVAIL'
count: '1'
--
To view, visit https://gerrit.asterisk.org/9135
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: If176aff9ca48a9e7037514c202b83b270eb52537
Gerrit-Change-Number: 9135
Gerrit-PatchSet: 1
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180613/539473e5/attachment-0001.html>
More information about the asterisk-code-review
mailing list