[asterisk-commits] tests/channels/pjsip: Update tests expected results for 'med... (testsuite[master])

[SVN commits to the Asterisk project]

Joshua Colp has submitted this change and it was merged.

Change subject: tests/channels/pjsip: Update tests expected results for 'media_encryption'
......................................................................


tests/channels/pjsip: Update tests expected results for 'media_encryption'

The 'media_encryption' setting does not understand the default value of
'none', even though that it is its default value. This can cause
problems if a configuration actually sets the value to 'none'. When this
was fixed in Asterisk, the various tests that check default values of
things weren't updated. This patch updates those tests so that they pass
again.

Change-Id: I40a0a31229b77edff6e68345a9943c92900b3428
---
M tests/channels/pjsip/ami/show_endpoint/test-config.yaml
M tests/channels/pjsip/config_wizard/phone/test-config.yaml
M tests/channels/pjsip/config_wizard/trunk/test-config.yaml
M tests/channels/pjsip/dialplan_functions/pjsip_endpoint/configs/ast1/extensions.conf
4 files changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Joshua Colp: Looks good to me, approved; Verified



diff --git a/tests/channels/pjsip/ami/show_endpoint/test-config.yaml b/tests/channels/pjsip/ami/show_endpoint/test-config.yaml
index bfc6b68..ea89c04 100644
--- a/tests/channels/pjsip/ami/show_endpoint/test-config.yaml
+++ b/tests/channels/pjsip/ami/show_endpoint/test-config.yaml
@@ -91,7 +91,7 @@
                     InbandProgress: 'false'
                     OneTouchRecording: 'false'
                     UseAvpf: 'false'
-                    MediaEncryption: 'none'
+                    MediaEncryption: 'no'
                     AggregateMwi: 'true'
                     Mailboxes: ''
                     SendDiversion: 'true'
@@ -285,7 +285,7 @@
                     InbandProgress: 'false'
                     OneTouchRecording: 'false'
                     UseAvpf: 'false'
-                    MediaEncryption: 'none'
+                    MediaEncryption: 'no'
                     AggregateMwi: 'true'
                     Mailboxes: ''
                     SendDiversion: 'true'
diff --git a/tests/channels/pjsip/config_wizard/phone/test-config.yaml b/tests/channels/pjsip/config_wizard/phone/test-config.yaml
index 48fedfd..ce0bed6 100644
--- a/tests/channels/pjsip/config_wizard/phone/test-config.yaml
+++ b/tests/channels/pjsip/config_wizard/phone/test-config.yaml
@@ -84,7 +84,7 @@
                     InbandProgress: 'false'
                     OneTouchRecording: 'false'
                     UseAvpf: 'false'
-                    MediaEncryption: 'none'
+                    MediaEncryption: 'no'
                     AggregateMwi: 'true'
                     Mailboxes: ''
                     SendDiversion: 'true'
diff --git a/tests/channels/pjsip/config_wizard/trunk/test-config.yaml b/tests/channels/pjsip/config_wizard/trunk/test-config.yaml
index 956e565..ba1223a 100644
--- a/tests/channels/pjsip/config_wizard/trunk/test-config.yaml
+++ b/tests/channels/pjsip/config_wizard/trunk/test-config.yaml
@@ -86,7 +86,7 @@
                     InbandProgress: 'false'
                     OneTouchRecording: 'false'
                     UseAvpf: 'false'
-                    MediaEncryption: 'none'
+                    MediaEncryption: 'no'
                     AggregateMwi: 'true'
                     Mailboxes: ''
                     SendDiversion: 'true'
diff --git a/tests/channels/pjsip/dialplan_functions/pjsip_endpoint/configs/ast1/extensions.conf b/tests/channels/pjsip/dialplan_functions/pjsip_endpoint/configs/ast1/extensions.conf
index 20ee14d..6e5a9d6 100644
--- a/tests/channels/pjsip/dialplan_functions/pjsip_endpoint/configs/ast1/extensions.conf
+++ b/tests/channels/pjsip/dialplan_functions/pjsip_endpoint/configs/ast1/extensions.conf
@@ -55,7 +55,7 @@
 same => n,GoSub(default,test_variable,1(alice,inband_progress,false))
 same => n,GoSub(default,test_variable,1(alice,one_touch_recording,false))
 same => n,GoSub(default,test_variable,1(alice,use_avpf,false))
-same => n,GoSub(default,test_variable,1(alice,media_encryption,none))
+same => n,GoSub(default,test_variable,1(alice,media_encryption,no))
 same => n,GoSub(default,test_variable,1(alice,aggregate_mwi,true))
 same => n,GoSub(default,test_variable,1(alice,mailboxes,))
 same => n,GoSub(default,test_variable,1(alice,send_diversion,true))

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

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