[svn-commits] mjordan: testsuite/asterisk/trunk r4819 - in /asterisk/trunk/tests/apps/confb...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Sat Mar 8 14:51:27 CST 2014


Author: mjordan
Date: Sat Mar  8 14:51:08 2014
New Revision: 4819

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=4819
Log:
conbridge_waitmarked_normal: Add test for waitmarked/normal user interaction

Three Scenarios went into this test:
1) A single Waitmarked user enters the conference to hear MusicOnHold. Then a
   Normal user enters the conference, yet does not change the fact that the
   waitmarked user still hears the MusicOnHold.

2) A Normal user enters the conference to hear MOH, then a Waitmarked user
   joins to hear the prompt 'conf-waitforleader' and MOH.

3) When both the Waitmarked and Normal user are in the conference, it tests to
   see if the state of the Waitmarked user will change if the Normal user
   leaves the conference first.

Review: https://reviewboard.asterisk.org/r/3310/

ASTERISK-23300 #close #resolve #comment rb3310.patch uploaded by jemidy (license 6581)

(closes issue ASTERISK-23300)
Reported by: Matt Jordan
patches:
  rb3310.patch uploaded by jemidy (license 6581)


Added:
    asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/
    asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/
    asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/
    asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/confbridge.conf   (with props)
    asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/extensions.conf   (with props)
    asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/musiconhold.conf   (with props)
    asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/test-config.yaml   (with props)
Modified:
    asterisk/trunk/tests/apps/confbridge/tests.yaml

Added: asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/confbridge.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/confbridge.conf?view=auto&rev=4819
==============================================================================
--- asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/confbridge.conf (added)
+++ asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/confbridge.conf Sat Mar  8 14:51:08 2014
@@ -1,0 +1,18 @@
+[general]
+
+[waitmarked_profile]
+type = user
+wait_marked = yes
+music_on_hold_when_empty = yes
+music_on_hold_class = default
+
+[normal_profile]
+type = user
+music_on_hold_when_empty = yes
+music_on_hold_class = default
+
+[default_bridge]
+type = bridge
+
+[default_user]
+type = user

Propchange: asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/confbridge.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/confbridge.conf
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/confbridge.conf
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/extensions.conf?view=auto&rev=4819
==============================================================================
--- asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/extensions.conf (added)
+++ asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/extensions.conf Sat Mar  8 14:51:08 2014
@@ -1,0 +1,35 @@
+[confbridge]
+
+exten => waitmarked,1,NoOp()
+	same => n,ConfBridge(1,,waitmarked_profile)
+	same => n,Hangup()
+
+exten => normal,1,NoOp()
+	same => n,ConfBridge(1,,normal_profile)
+	same => n,Hangup()
+
+[default]
+
+exten => sendDTMF,1,NoOp()
+	same => n,Verbose(1, Sending DTMF Signal ${DTMF_TO_SEND})
+	same => n,SendDTMF(${DTMF_TO_SEND})
+	same => n,Goto(default,wait,1)
+
+exten => sendAudio,1,NoOp()
+	same => n,Verbose(1, Sending audio file ${TALK_AUDIO})
+	same => n,Playback(${TALK_AUDIO})
+	same => n,Goto(default,wait,1)
+
+exten => sendAudioWithDTMF,1,NoOp()
+	same => n,Verbose(1, Sending audio file ${TALK_AUDIO})
+	same => n,Playback(${TALK_AUDIO})
+	same => n,Verbose(1, Sending DTMF Signal ${DTMF_TO_SEND})
+	same => n,SendDTMF(${DTMF_TO_SEND})
+	same => n,Goto(default,wait,1)
+
+exten => hangup,1,NoOp()
+	same => n,Verbose(1, Hanging up)
+	same => n,Hangup()
+
+exten => wait,1,NoOp()
+	same => n,Wait(10000)

Propchange: asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/extensions.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/extensions.conf
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/extensions.conf
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/musiconhold.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/musiconhold.conf?view=auto&rev=4819
==============================================================================
--- asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/musiconhold.conf (added)
+++ asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/musiconhold.conf Sat Mar  8 14:51:08 2014
@@ -1,0 +1,6 @@
+[general]
+
+[default]
+
+mode=files
+directory=moh

Propchange: asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/musiconhold.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/musiconhold.conf
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/configs/ast1/musiconhold.conf
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: 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=auto&rev=4819
==============================================================================
--- asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/test-config.yaml (added)
+++ asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/test-config.yaml Sat Mar  8 14:51:08 2014
@@ -1,0 +1,587 @@
+testinfo:
+    summary: "Tests interaction between waitmarked and normal users"
+    description: |
+          This test is testing the interaction between waitmarked and normal
+          users. It is doing this through three scenarios.
+          (1) The waitmarked user joins the conference and hears MOH. Then the
+              Normal user joins the conference to change the state to SINGLE,
+              yet the waitmarked user continues to hear MOH.
+          (2) The Normal user joins the conference, then the waitmarked user
+              joins and is played conf-waitforleader and is listening to MOH.
+          (3) The Waitmarked user joins the conference followed by the Normal
+              user. Then the Normal user leaves the conference and the Waitmarked
+              user does not change state, until the channel is hung up.
+
+test-modules:
+    test-object:
+        config-section: test-object-config
+        typename: 'apptest.AppTest'
+
+test-object-config:
+  reactor-timeout: '60'
+  app: 'ConfBridge'
+  scenarios:
+    -
+      # Scenario 1: A Waitmarked user joins the conference, and hears
+      # the waiting for leader prompt as well as MOH. Then a Normal
+      # user joins the conference, and the waitmarked user continues
+      # to hear the MOH.
+      events:
+        -
+          type: 'headermatch'
+          conditions:
+            match:
+              Event: 'ConfbridgeStart'
+              Conference: '1'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference Started'
+        -
+          type: 'headermatch'
+          conditions:
+            match:
+              Event: 'TestEvent'
+              State: 'CONF_CHANGE_STATE'
+              OldState: 'EMPTY'
+              NewState: 'INACTIVE'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference Transitioned from EMPTY to INACTIVE'
+            -
+              action-type: 'start-call'
+              delay: 2
+              channel-id: 'Normal_user'
+        -
+          type: 'headermatch'
+          conditions:
+            match:
+              Event: 'TestEvent'
+              State: 'CONF_CHANGE_STATE'
+              OldState: 'INACTIVE'
+              NewState: 'SINGLE'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference Transitioned from INACTIVE to SINGLE'
+        -
+          type: 'headermatch'
+          conditions:
+            match:
+              Event: 'TestEvent'
+              State: 'CONF_CHANGE_STATE'
+              OldState: 'SINGLE'
+              NewState: 'INACTIVE'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference Transitioned from SINGLE to INACTIVE'
+            -
+              action-type: 'hangup'
+              delay: 2
+              channel-id: 'Waitmarked_user'
+        -
+          type: 'headermatch'
+          conditions:
+            match:
+              Event: 'TestEvent'
+              State: 'CONF_CHANGE_STATE'
+              OldState: 'INACTIVE'
+              NewState: 'EMPTY'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference Transitioned from INACTIVE to EMPTY'
+        -
+          type: 'headermatch'
+          conditions:
+            match:
+              Event: 'ConfbridgeEnd'
+              Conference: '1'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference Ended'
+            -
+              action-type: 'end-scenario'
+      channels:
+        -
+          channel-id: 'Normal_user'
+          channel-name: 'Local/normal at confbridge'
+          context: 'default'
+          exten: 'wait'
+          events:
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'ConfbridgeJoin'
+                  Conference: '1'
+                  Channel: 'Local/normal at confbridge-.*'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Normal_user Join Event Received'
+                -
+                  action-type: 'hangup'
+                  delay: 2
+                  channel-id: 'Normal_user'
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'ConfbridgeLeave'
+                  Conference: '1'
+                  Channel: 'Local/normal at confbridge-.*'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Normal_user Leave Event Received'
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'TestEvent'
+                  Channel: 'Local/normal at confbridge-.*'
+                  State: 'PLAYBACK'
+                  Message: 'confbridge-join'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Normal_user Heard Join Sound'
+            -
+              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'
+        -
+          channel-id: 'Waitmarked_user'
+          channel-name: 'Local/waitmarked at confbridge'
+          context: 'default'
+          exten: 'wait'
+          start-on-create: True
+          events:
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'ConfbridgeJoin'
+                  Conference: '1'
+                  Channel: 'Local/waitmarked at confbridge-.*'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Waitmarked_user Join Event Received'
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'ConfbridgeLeave'
+                  Conference: '1'
+                  Channel: 'Local/waitmarked at confbridge-.*'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Waitmarked_user Leave Event Received'
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'MusicOnHold'
+                  Channel: 'Local/waitmarked at confbridge-.*'
+                  State: 'Start'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'MusicOnHold Event Received'
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'TestEvent'
+                  Channel: 'Local/waitmarked at confbridge-.*'
+                  State: 'PLAYBACK'
+                  Message: 'conf-waitforleader'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Waitmarked_user is waiting for Leader'
+    -
+      # Scenario 2: First, the Normal user joins the conference and ultimately
+      # hears MOH. Then the Waitmarked user joins the conference with the
+      # conf-waitforleader prompt and hears MOH until the Marked user shows up.
+      events:
+        -
+          type: 'headermatch'
+          conditions:
+            match:
+              Event: 'ConfbridgeStart'
+              Conference: '1'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference Started'
+        -
+          type: 'headermatch'
+          conditions:
+            match:
+              Event: 'TestEvent'
+              State: 'CONF_CHANGE_STATE'
+              OldState: 'EMPTY'
+              NewState: 'SINGLE'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference Transitioned from EMPTY to SINGLE'
+            -
+              action-type: 'start-call'
+              delay: 2
+              channel-id: 'Waitmarked_user'
+        -
+          type: 'headermatch'
+          conditions:
+            match:
+              Event: 'TestEvent'
+              State: 'CONF_CHANGE_STATE'
+              OldState: 'SINGLE'
+              NewState: 'INACTIVE'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference Transitioned from SINGLE to INACTIVE'
+        -
+          type: 'headermatch'
+          conditions:
+            match:
+              Event: 'TestEvent'
+              State: 'CONF_CHANGE_STATE'
+              OldState: 'INACTIVE'
+              NewState: 'EMPTY'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference Transitioned from INACTIVE to EMPTY'
+        -
+          type: 'headermatch'
+          conditions:
+            match:
+              Event: 'ConfbridgeEnd'
+              Conference: '1'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference Ended'
+            -
+              action-type: 'end-scenario'
+      channels:
+        -
+          channel-id: 'Normal_user'
+          channel-name: 'Local/normal at confbridge'
+          context: 'default'
+          exten: 'wait'
+          start-on-create: True
+          events:
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'ConfbridgeJoin'
+                  Conference: '1'
+                  Channel: 'Local/normal at confbridge-.*'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Normal_user Join Event Receieved'
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'ConfbridgeLeave'
+                  Conference: '1'
+                  Channel: 'Local/normal at confbridge-.*'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Normal_user Leave Event Received'
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'TestEvent'
+                  Channel: 'Local/normal at confbridge-.*'
+                  State: 'PLAYBACK'
+                  Message: 'confbridge-join'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Normal_user Heard Join Sound'
+            -
+              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'
+        -
+          channel-id: 'Waitmarked_user'
+          channel-name: 'Local/waitmarked at confbridge'
+          context: 'default'
+          exten: 'wait'
+          events:
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'ConfbridgeJoin'
+                  Conference: '1'
+                  Channel: 'Local/waitmarked at confbridge-.*'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Waitmarked_user Join Event Received'
+                -
+                  action-type: 'hangup'
+                  delay: 2
+                  channel-id: 'Normal_user'
+                -
+                  action-type: 'hangup'
+                  delay: 4
+                  channel-id: 'Waitmarked_user'
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'ConfbridgeLeave'
+                  Conference: '1'
+                  Channel: 'Local/waitmarked at confbridge-.*'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Waitmarked_user Leave Event Received'
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'MusicOnHold'
+                  Channel: 'Local/waitmarked at confbridge-.*'
+                  State: 'Start'
+              actions:
+               -
+                  action-type: 'set-expected-result'
+                  expected-result: 'MusicOnHold Event Received'
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'TestEvent'
+                  Channel: 'Local/waitmarked at confbridge-.*'
+                  State: 'PLAYBACK'
+                  Message: 'conf-waitforleader'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Waitmarked_user is waiting for Leader'
+    -
+      # Scenario 3: The Waitmarked user joins the conference, and is serenaded
+      # by MOH. Then the Normal user joins the conference also to hear MOH. The
+      # Normal user then leaves the conference, which causes the Waitmarked
+      # user to stay in the INACTIVE state until the channel is finally hung up.
+      events:
+        -
+          type: 'headermatch'
+          conditions:
+            match:
+              Event: 'ConfbridgeStart'
+              Conference: '1'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference Started'
+        -
+          type: 'headermatch'
+          conditions:
+            match:
+              Event: 'TestEvent'
+              State: 'CONF_CHANGE_STATE'
+              OldState: 'EMPTY'
+              NewState: 'INACTIVE'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference Transitioned from EMPTY to INACTIVE'
+            -
+              action-type: 'start-call'
+              delay: 2
+              channel-id: 'Normal_user'
+        -
+          type: 'headermatch'
+          conditions:
+            match:
+              Event: 'TestEvent'
+              State: 'CONF_CHANGE_STATE'
+              OldState: 'INACTIVE'
+              NewState: 'SINGLE'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference Transitioned from INACTIVE to SINGLE'
+        -
+          type: 'headermatch'
+          conditions:
+            match:
+              Event: 'TestEvent'
+              State: 'CONF_CHANGE_STATE'
+              OldState: 'SINGLE'
+              NewState: 'EMPTY'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference Transitioned from SINGLE to EMPTY'
+        -
+          type: 'headermatch'
+          conditions:
+            match:
+              Event: 'ConfbridgeEnd'
+              Conference: '1'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference Ended'
+            -
+              action-type: 'end-scenario'
+      channels:
+        -
+          channel-id: 'Normal_user'
+          channel-name: 'Local/normal at confbridge'
+          context: 'default'
+          exten: 'wait'
+          events:
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'ConfbridgeJoin'
+                  Conference: '1'
+                  Channel: 'Local/normal at confbridge-.*'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Normal_user Join Event Received'
+                -
+                  action-type: 'hangup'
+                  delay: 2
+                  channel-id: 'Waitmarked_user'
+                -
+                  action-type: 'hangup'
+                  delay: 4
+                  channel-id: 'Normal_user'
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'ConfbridgeLeave'
+                  Conference: '1'
+                  Channel: 'Local/normal at confbridge-.*'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Normal_user Leave Event Received'
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'TestEvent'
+                  Channel: 'Local/normal at confbridge-.*'
+                  State: 'PLAYBACK'
+                  Message: 'confbridge-join'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Normal_user Heard Join Sound'
+            -
+              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'
+        -
+          channel-id: 'Waitmarked_user'
+          channel-name: 'Local/waitmarked at confbridge'
+          context: 'default'
+          exten: 'wait'
+          start-on-create: True
+          events:
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'ConfbridgeJoin'
+                  Conference: '1'
+                  Channel: 'Local/waitmarked at confbridge-.*'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Waitmarked_user Join Event Received'
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'ConfbridgeLeave'
+                  Conference: '1'
+                  Channel: 'Local/waitmarked at confbridge-.*'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Waitmarked_user Leave Event Received'
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'MusicOnHold'
+                  Channel: 'Local/waitmarked at confbridge-.*'
+                  State: 'Start'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'MusicOnHold Event Received'
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'TestEvent'
+                  Channel: 'Local/waitmarked at confbridge-.*'
+                  State: 'PLAYBACK'
+                  Message: 'conf-waitforleader'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Waitmarked_user is waiting for Leader'
+
+properties:
+    minversion: '11.8.0'
+    tags:
+      - confbridge
+      - apps
+    dependencies:
+      - buildoption: 'TEST_FRAMEWORK'
+      - python : 'twisted'
+      - python : 'starpy'
+      - asterisk : 'app_confbridge'
+      - asterisk : 'app_senddtmf'
+      - asterisk : 'app_playback'

Propchange: asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/test-config.yaml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/test-config.yaml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: asterisk/trunk/tests/apps/confbridge/confbridge_waitmarked_normal/test-config.yaml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: asterisk/trunk/tests/apps/confbridge/tests.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/confbridge/tests.yaml?view=diff&rev=4819&r1=4818&r2=4819
==============================================================================
--- asterisk/trunk/tests/apps/confbridge/tests.yaml (original)
+++ asterisk/trunk/tests/apps/confbridge/tests.yaml Sat Mar  8 14:51:08 2014
@@ -2,6 +2,7 @@
 tests:
     - test: 'confbridge_marked_unmarked'
     - test: 'confbridge_marked'
+    - test: 'confbridge_waitmarked_normal'
     - test: 'confbridge_waitmarked_single'
     - test: 'confbridge_waitmarked_only'
     - test: 'confbridge_waitmarked_kick'




More information about the svn-commits mailing list