[svn-commits] mjordan: testsuite/asterisk/trunk r4825 - in /asterisk/trunk/tests/apps/confb...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Sun Mar 9 22:14:25 CDT 2014
Author: mjordan
Date: Sun Mar 9 22:14:19 2014
New Revision: 4825
URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=4825
Log:
waitmarked user tests: Run under 12; provide a default musiconhold.conf
Because the MusicOnHold event was changed in 12 to MusicOnHoldStart, it's
better to just run these tests under 12+ and look for the new event name,
as opposed to the old. This patch also provides some default musiconhold.conf
config files, just in case.
Added:
asterisk/trunk/tests/apps/confbridge/confbridge_triple_lindy/configs/ast1/musiconhold.conf (with props)
asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_only/configs/ast1/musiconhold.conf (with props)
Modified:
asterisk/trunk/tests/apps/confbridge/confbridge_triple_lindy/test-config.yaml
asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/test-config.yaml
asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_only/test-config.yaml
Added: asterisk/trunk/tests/apps/confbridge/confbridge_triple_lindy/configs/ast1/musiconhold.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/confbridge/confbridge_triple_lindy/configs/ast1/musiconhold.conf?view=auto&rev=4825
==============================================================================
--- asterisk/trunk/tests/apps/confbridge/confbridge_triple_lindy/configs/ast1/musiconhold.conf (added)
+++ asterisk/trunk/tests/apps/confbridge/confbridge_triple_lindy/configs/ast1/musiconhold.conf Sun Mar 9 22:14:19 2014
@@ -1,0 +1,6 @@
+[general]
+
+[default]
+
+mode=files
+directory=moh
Propchange: asterisk/trunk/tests/apps/confbridge/confbridge_triple_lindy/configs/ast1/musiconhold.conf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: asterisk/trunk/tests/apps/confbridge/confbridge_triple_lindy/configs/ast1/musiconhold.conf
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: asterisk/trunk/tests/apps/confbridge/confbridge_triple_lindy/configs/ast1/musiconhold.conf
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: asterisk/trunk/tests/apps/confbridge/confbridge_triple_lindy/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/confbridge/confbridge_triple_lindy/test-config.yaml?view=diff&rev=4825&r1=4824&r2=4825
==============================================================================
--- asterisk/trunk/tests/apps/confbridge/confbridge_triple_lindy/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/confbridge/confbridge_triple_lindy/test-config.yaml Sun Mar 9 22:14:19 2014
@@ -1092,7 +1092,7 @@
message: 'Waitmarked user should not hear conf-waitforleader.'
properties:
- minversion: '11.8.0'
+ minversion: '12.0.0'
tags:
- confbridge
- apps
Modified: asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/test-config.yaml?view=diff&rev=4825&r1=4824&r2=4825
==============================================================================
--- asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/test-config.yaml Sun Mar 9 22:14:19 2014
@@ -154,13 +154,12 @@
type: 'headermatch'
conditions:
match:
- Event: 'MusicOnHold'
- Channel: 'Local/normal at confbridge-.*'
- State: 'Start'
- actions:
- -
- action-type: 'set-expected-result'
- expected-result: 'MusicOnHold Event Received for Normal_user'
+ Event: 'MusicOnHoldStart'
+ Channel: 'Local/normal at confbridge-.*'
+ actions:
+ -
+ action-type: 'set-expected-result'
+ expected-result: 'MusicOnHoldStart Event Received for Normal_user'
-
channel-id: 'Waitmarked_user'
channel-name: 'Local/waitmarked at confbridge'
@@ -194,13 +193,12 @@
type: 'headermatch'
conditions:
match:
- Event: 'MusicOnHold'
- Channel: 'Local/waitmarked at confbridge-.*'
- State: 'Start'
- actions:
- -
- action-type: 'set-expected-result'
- expected-result: 'MusicOnHold Event Received'
+ Event: 'MusicOnHoldStart'
+ Channel: 'Local/waitmarked at confbridge-.*'
+ actions:
+ -
+ action-type: 'set-expected-result'
+ expected-result: 'MusicOnHoldStart Event Received'
-
type: 'headermatch'
conditions:
@@ -326,13 +324,12 @@
type: 'headermatch'
conditions:
match:
- Event: 'MusicOnHold'
- Channel: 'Local/normal at confbridge-.*'
- State: 'Start'
- actions:
- -
- action-type: 'set-expected-result'
- expected-result: 'MusicOnHold Event Received for Normal_user'
+ Event: 'MusicOnHoldStart'
+ Channel: 'Local/normal at confbridge-.*'
+ actions:
+ -
+ action-type: 'set-expected-result'
+ expected-result: 'MusicOnHoldStart Event Received for Normal_user'
-
channel-id: 'Waitmarked_user'
channel-name: 'Local/waitmarked at confbridge'
@@ -373,13 +370,12 @@
type: 'headermatch'
conditions:
match:
- Event: 'MusicOnHold'
- Channel: 'Local/waitmarked at confbridge-.*'
- State: 'Start'
+ Event: 'MusicOnHoldStart'
+ Channel: 'Local/waitmarked at confbridge-.*'
actions:
-
action-type: 'set-expected-result'
- expected-result: 'MusicOnHold Event Received'
+ expected-result: 'MusicOnHoldStart Event Received'
-
type: 'headermatch'
conditions:
@@ -513,13 +509,12 @@
type: 'headermatch'
conditions:
match:
- Event: 'MusicOnHold'
- Channel: 'Local/normal at confbridge-.*'
- State: 'Start'
- actions:
- -
- action-type: 'set-expected-result'
- expected-result: 'MusicOnHold Event Received for Normal_user'
+ Event: 'MusicOnHoldStart'
+ Channel: 'Local/normal at confbridge-.*'
+ actions:
+ -
+ action-type: 'set-expected-result'
+ expected-result: 'MusicOnHoldStart Event Received for Normal_user'
-
channel-id: 'Waitmarked_user'
channel-name: 'Local/waitmarked at confbridge'
@@ -553,13 +548,12 @@
type: 'headermatch'
conditions:
match:
- Event: 'MusicOnHold'
- Channel: 'Local/waitmarked at confbridge-.*'
- State: 'Start'
- actions:
- -
- action-type: 'set-expected-result'
- expected-result: 'MusicOnHold Event Received'
+ Event: 'MusicOnHoldStart'
+ Channel: 'Local/waitmarked at confbridge-.*'
+ actions:
+ -
+ action-type: 'set-expected-result'
+ expected-result: 'MusicOnHoldStart Event Received'
-
type: 'headermatch'
conditions:
@@ -574,7 +568,7 @@
expected-result: 'Waitmarked_user is waiting for Leader'
properties:
- minversion: '11.8.0'
+ minversion: '12.0.0'
tags:
- confbridge
- apps
Added: asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_only/configs/ast1/musiconhold.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_only/configs/ast1/musiconhold.conf?view=auto&rev=4825
==============================================================================
--- asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_only/configs/ast1/musiconhold.conf (added)
+++ asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_only/configs/ast1/musiconhold.conf Sun Mar 9 22:14:19 2014
@@ -1,0 +1,6 @@
+[general]
+
+[default]
+
+mode=files
+directory=moh
Propchange: asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_only/configs/ast1/musiconhold.conf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_only/configs/ast1/musiconhold.conf
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_only/configs/ast1/musiconhold.conf
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_only/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_only/test-config.yaml?view=diff&rev=4825&r1=4824&r2=4825
==============================================================================
--- asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_only/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_only/test-config.yaml Sun Mar 9 22:14:19 2014
@@ -196,7 +196,7 @@
expected-result: 'Waitmarked2 heard conf-waitforleader.'
properties:
- minversion: '11.8.0'
+ minversion: '12.0.0'
tags:
- confbridge
- apps
More information about the svn-commits
mailing list