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

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Feb 20 21:43:37 CST 2014


Author: mjordan
Date: Thu Feb 20 21:43:31 2014
New Revision: 4727

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=4727
Log:
confbridge: Add test for marked/unmarked user interaction

This test adds to the existing ConfBridge state machine tests. In this case, it
checks the interactions between marked and normal (unmarked) users.

There are three scenarios:
1) Marked user enters first and leaves last.
2) Marked user enters first and normal user leaves last, which signifies that a
   MoH event will be played when the normal user is in a conference alone.
3) Normal user enters first and leaves last.

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

(closes issue ASTERISK-23198)
Reported by: Matt Jordan
patches:
  rb3221.patch uploaded by jemidy (License 6581)


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

Modified: asterisk/trunk/tests/apps/confbridge/confbridge_marked/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/confbridge/confbridge_marked/configs/ast1/extensions.conf?view=diff&rev=4727&r1=4726&r2=4727
==============================================================================
--- asterisk/trunk/tests/apps/confbridge/confbridge_marked/configs/ast1/extensions.conf (original)
+++ asterisk/trunk/tests/apps/confbridge/confbridge_marked/configs/ast1/extensions.conf Thu Feb 20 21:43:31 2014
@@ -34,4 +34,4 @@
 	same => n,Hangup()
 
 exten => wait,1,NoOp()
-	same => n,Wait(10000)
+	same => n,Wait(10000)

Added: asterisk/trunk/tests/apps/confbridge/confbridge_marked_unmarked/configs/ast1/confbridge.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/confbridge/confbridge_marked_unmarked/configs/ast1/confbridge.conf?view=auto&rev=4727
==============================================================================
--- asterisk/trunk/tests/apps/confbridge/confbridge_marked_unmarked/configs/ast1/confbridge.conf (added)
+++ asterisk/trunk/tests/apps/confbridge/confbridge_marked_unmarked/configs/ast1/confbridge.conf Thu Feb 20 21:43:31 2014
@@ -1,0 +1,17 @@
+[general]
+
+[marked_profile]
+type = user
+marked = yes
+
+[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_marked_unmarked/configs/ast1/confbridge.conf
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Added: asterisk/trunk/tests/apps/confbridge/confbridge_marked_unmarked/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/confbridge/confbridge_marked_unmarked/configs/ast1/extensions.conf?view=auto&rev=4727
==============================================================================
--- asterisk/trunk/tests/apps/confbridge/confbridge_marked_unmarked/configs/ast1/extensions.conf (added)
+++ asterisk/trunk/tests/apps/confbridge/confbridge_marked_unmarked/configs/ast1/extensions.conf Thu Feb 20 21:43:31 2014
@@ -1,0 +1,35 @@
+[confbridge]
+
+exten => marked,1,NoOp()
+	same => n,ConfBridge(1,,marked_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_marked_unmarked/configs/ast1/extensions.conf
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Added: asterisk/trunk/tests/apps/confbridge/confbridge_marked_unmarked/configs/ast1/musiconhold.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/confbridge/confbridge_marked_unmarked/configs/ast1/musiconhold.conf?view=auto&rev=4727
==============================================================================
--- asterisk/trunk/tests/apps/confbridge/confbridge_marked_unmarked/configs/ast1/musiconhold.conf (added)
+++ asterisk/trunk/tests/apps/confbridge/confbridge_marked_unmarked/configs/ast1/musiconhold.conf Thu Feb 20 21:43:31 2014
@@ -1,0 +1,6 @@
+[general]
+
+[default]
+
+mode=files
+directory=moh

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

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

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

Added: asterisk/trunk/tests/apps/confbridge/confbridge_marked_unmarked/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/confbridge/confbridge_marked_unmarked/test-config.yaml?view=auto&rev=4727
==============================================================================
--- asterisk/trunk/tests/apps/confbridge/confbridge_marked_unmarked/test-config.yaml (added)
+++ asterisk/trunk/tests/apps/confbridge/confbridge_marked_unmarked/test-config.yaml Thu Feb 20 21:43:31 2014
@@ -1,0 +1,614 @@
+testinfo:
+    summary: 'Tests interaction between marked and unmarked users in a Conference'
+    description: |
+        This tests the interaction of normal users and marked users in a conference. It
+        specifically goes into checking whether the Marked and Normal users received the
+        proper notifications; that MOH is played when the Normal user is the last or
+        first person in the conference; And that all of the transitions between states in
+        the conference are working appropriately. This test contains three scenarios -
+        the first in which the marked user enters first and hangs up last; the second
+        includes the marked user entering first and the normal user hanging up last;
+        lastly, the third tests when the normal user enters the conference first and
+        leaves last.
+
+test-modules:
+    test-object:
+        config-section: test-object-config
+        typename: 'apptest.AppTest'
+
+test-object-config:
+  reactor-timeout: '60'
+  app: 'ConfBridge'
+  scenarios:
+    -
+      # Scenario 1: The Marked user enters. Gets notifications of their presence in
+      # the conference. Normal(unmarked) user enters; gets notification that they have
+      # joined the conference, but should receive no notification of position in
+      # conference. Normal user leaves, followed by the Marked user. Checks to make sure
+      # all conference state transitions executed as planned.
+      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_MARKED'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference transitioned from EMPTY to SINGLE_MARKED'
+            -
+              action-type: 'start-call'
+              delay: 3
+              channel-id: 'Normal-user'
+        -
+          type: 'headermatch'
+          conditions:
+            match:
+              Event: 'TestEvent'
+              State: 'CONF_CHANGE_STATE'
+              OldState: 'SINGLE_MARKED'
+              NewState: 'MULTI_MARKED'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference transitioned from SINGLE_MARKED to MULTI_MARKED'
+            -
+              action-type: 'hangup'
+              delay: 2
+              channel-id: 'Normal-user'
+        -
+          type: 'headermatch'
+          conditions:
+            match:
+              Event: 'TestEvent'
+              State: 'CONF_CHANGE_STATE'
+              OldState: 'MULTI_MARKED'
+              NewState: 'SINGLE_MARKED'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference transitioned from MULTI_MARKED to SINGLE_MARKED'
+            -
+              action-type: 'hangup'
+              delay: 2
+              channel-id: 'Marked-user'
+        -
+          type: 'headermatch'
+          conditions:
+            match:
+              Event: 'TestEvent'
+              State: 'CONF_CHANGE_STATE'
+              OldState: 'SINGLE_MARKED'
+              NewState: 'EMPTY'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference transitioned from SINGLE_MARKED 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: 'Marked-user'
+          channel-name: 'Local/marked at confbridge'
+          context: 'default'
+          exten: 'wait'
+          start-on-create: True
+          events:
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'ConfbridgeJoin'
+                  Conference: '1'
+                  Channel: 'Local/marked at confbridge-.*'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Marked-user Join Event received'
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'ConfbridgeLeave'
+                  Conference: '1'
+                  Channel: 'Local/marked at confbridge-.*'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Marked-user Leave Event received'
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'TestEvent'
+                  Channel: 'Local/marked at confbridge-.*'
+                  State: 'PLAYBACK'
+                  Message: 'confbridge-join'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Marked-user Heard Join Sound'
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'MusicOnHoldStart'
+                  Channel: 'Local/marked at confbridge-.*'
+              actions:
+                -
+                  action-type: 'fail-test'
+                  message: 'MusicOnHoldStart played to marked user!'
+
+        -
+          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'
+            -
+              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: 'MusicOnHoldStart'
+                  Channel: 'Local/normal at confbridge-.*'
+              actions:
+                -
+                  action-type: 'fail-test'
+                  message: 'MusicOnHoldStart played to normal user that is in conference alone!'
+    -
+      # Scenario 2: The Marked user enters. Gets notifications of their presence in
+      # the conference. Normal(unmarked) user enters; gets notification that they have
+      # joined the conference, but should receive no notification of position in
+      # conference. Marked user leaves, followed by the Normal user who has a MOH event
+      # taking place. Checks to make sure all conference state transitions executed as
+      # planned.
+      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_MARKED'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference transitioned from EMPTY to SINGLE_MARKED'
+            -
+              action-type: 'start-call'
+              delay: 3
+              channel-id: 'Normal-user'
+        -
+          type: 'headermatch'
+          conditions:
+            match:
+              Event: 'TestEvent'
+              State: 'CONF_CHANGE_STATE'
+              OldState: 'SINGLE_MARKED'
+              NewState: 'MULTI_MARKED'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference transitioned from SINGLE_MARKED to MULTI_MARKED'
+            -
+              action-type: 'hangup'
+              delay: 2
+              channel-id: 'Marked-user'
+        -
+          type: 'headermatch'
+          conditions:
+            match:
+              Event: 'TestEvent'
+              State: 'CONF_CHANGE_STATE'
+              OldState: 'MULTI_MARKED'
+              NewState: 'SINGLE'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference transitioned from MULTI_MARKED to SINGLE'
+            -
+              action-type: 'hangup'
+              delay: 2
+              channel-id: 'Normal-user'
+        -
+          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: 'Marked-user'
+          channel-name: 'Local/marked at confbridge'
+          context: 'default'
+          exten: 'wait'
+          start-on-create: True
+          events:
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'ConfbridgeJoin'
+                  Conference: '1'
+                  Channel: 'Local/marked at confbridge-.*'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Marked-user Join Event received'
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'ConfbridgeLeave'
+                  Conference: '1'
+                  Channel: 'Local/marked at confbridge-.*'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Marked-user Leave Event received'
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'TestEvent'
+                  Channel: 'Local/marked at confbridge-.*'
+                  State: 'PLAYBACK'
+                  Message: 'confbridge-join'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Marked-user Heard Join Sound'
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'MusicOnHoldStart'
+                  Channel: 'Local/marked at confbridge-.*'
+              actions:
+                -
+                  action-type: 'fail-test'
+                  message: 'MusicOnHoldStart played to marked user!'
+
+        -
+          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'
+            -
+              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: 'MusicOnHoldStart'
+                  Channel: 'Local/normal at confbridge-.*'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'MusicOnHoldStart Event Received'
+    -
+      # Scenario 3: The Normal user enters and receives a MOH event. Gets notifications
+      # of their presence in the conference, but receives no notification of position in
+      # conference. Marked user enters, which stops the MOH; gets notifications of their
+      # presence in the conference. Marked user leaves, followed by the Normal user who
+      # has a MOH event taking place. Checks to make sure all conference state transitions
+      # executed as planned.
+      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: 3
+              channel-id: 'Marked-user'
+        -
+          type: 'headermatch'
+          conditions:
+            match:
+              Event: 'TestEvent'
+              State: 'CONF_CHANGE_STATE'
+              OldState: 'SINGLE'
+              NewState: 'MULTI_MARKED'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference transitioned from SINGLE to MULTI_MARKED'
+        -
+          type: 'headermatch'
+          conditions:
+            match:
+              Event: 'TestEvent'
+              State: 'CONF_CHANGE_STATE'
+              OldState: 'MULTI_MARKED'
+              NewState: 'SINGLE'
+          actions:
+            -
+              action-type: 'set-expected-result'
+              expected-result: 'Conference transitioned from MULTI_MARKED to SINGLE'
+            -
+              action-type: 'hangup'
+              delay: 2
+              channel-id: 'Normal-user'
+        -
+          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: 'Marked-user'
+          channel-name: 'Local/marked at confbridge'
+          context: 'default'
+          exten: 'wait'
+          start-on-create: False
+          events:
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'ConfbridgeJoin'
+                  Conference: '1'
+                  Channel: 'Local/marked at confbridge-.*'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Marked-user Join Event received'
+                -
+                  action-type: 'hangup'
+                  delay: 2
+                  channel-id: 'Marked-user'
+
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'ConfbridgeLeave'
+                  Conference: '1'
+                  Channel: 'Local/marked at confbridge-.*'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Marked-user Leave Event received'
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'TestEvent'
+                  Channel: 'Local/marked at confbridge-.*'
+                  State: 'PLAYBACK'
+                  Message: 'confbridge-join'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'Marked-user Heard Join Sound'
+            -
+              type: 'headermatch'
+              conditions:
+                match:
+                  Event: 'MusicOnHoldStart'
+                  Channel: 'Local/marked at confbridge-.*'
+              actions:
+                -
+                  action-type: 'fail-test'
+                  message: 'MusicOnHoldStart played to marked user!'
+        -
+          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 Received'
+            -
+              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: 'MusicOnHoldStart'
+                  Channel: 'Local/normal at confbridge-.*'
+              actions:
+                -
+                  action-type: 'set-expected-result'
+                  expected-result: 'MusicOnHoldStart Event received'
+
+properties:
+    minversion: '12.0.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_marked_unmarked/test-config.yaml
------------------------------------------------------------------------------
    svn:eol-style = native

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

Propchange: asterisk/trunk/tests/apps/confbridge/confbridge_marked_unmarked/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=4727&r1=4726&r2=4727
==============================================================================
--- asterisk/trunk/tests/apps/confbridge/tests.yaml (original)
+++ asterisk/trunk/tests/apps/confbridge/tests.yaml Thu Feb 20 21:43:31 2014
@@ -1,5 +1,6 @@
 # Enter tests here in the order they should be considered for execution:
 tests:
+    - test: 'confbridge_marked_unmarked'
     - test: 'confbridge_marked'
     - test: 'confbridge_waitmarked_single'
     - test: 'confbridge_waitmarked_kick'




More information about the asterisk-commits mailing list