[asterisk-commits] mmichelson: testsuite/asterisk/trunk r5578 - in /asterisk/trunk/tests/channel...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Sep 10 11:11:59 2014
New Revision: 5578

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=5578
Log:
Fix test failures for inter-Asterisk MWI.

Somehow, I ended up doubling the content of test-config.yaml, and the two pjsip.conf
files. This caused extra events to be sent, which caused confusion when trying to
match expected events.


Modified:
    asterisk/trunk/tests/channels/pjsip/publish/asterisk_event_mwi/configs/ast1/pjsip.conf
    asterisk/trunk/tests/channels/pjsip/publish/asterisk_event_mwi/configs/ast2/pjsip.conf
    asterisk/trunk/tests/channels/pjsip/publish/asterisk_event_mwi/test-config.yaml

Modified: asterisk/trunk/tests/channels/pjsip/publish/asterisk_event_mwi/configs/ast1/pjsip.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/pjsip/publish/asterisk_event_mwi/configs/ast1/pjsip.conf?view=diff&rev=5578&r1=5577&r2=5578
==============================================================================
--- asterisk/trunk/tests/channels/pjsip/publish/asterisk_event_mwi/configs/ast1/pjsip.conf (original)
+++ asterisk/trunk/tests/channels/pjsip/publish/asterisk_event_mwi/configs/ast1/pjsip.conf Wed Sep 10 11:11:59 2014
@@ -11,16 +11,4 @@
 server_uri=sip:ast1 at 127.0.0.1:5061
 event=asterisk-mwi
 @mailbox_state_filter=bunny-rabbit
-[global]
-type=global
-debug=yes
 
-[main-transport]
-type=transport
-bind = 127.0.0.1:5060
-
-[ast2]
-type=outbound-publish
-server_uri=sip:ast1 at 127.0.0.1:5061
-event=asterisk-mwi
- at mailbox_state_filter=bunny-rabbit

Modified: asterisk/trunk/tests/channels/pjsip/publish/asterisk_event_mwi/configs/ast2/pjsip.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/pjsip/publish/asterisk_event_mwi/configs/ast2/pjsip.conf?view=diff&rev=5578&r1=5577&r2=5578
==============================================================================
--- asterisk/trunk/tests/channels/pjsip/publish/asterisk_event_mwi/configs/ast2/pjsip.conf (original)
+++ asterisk/trunk/tests/channels/pjsip/publish/asterisk_event_mwi/configs/ast2/pjsip.conf Wed Sep 10 11:11:59 2014
@@ -16,21 +16,3 @@
 [ast1]
 type=asterisk-publication
 mailbox_state=yes
-[global]
-type=global
-debug=yes
-
-[main-transport]
-type=transport
-bind = 127.0.0.1:5061
-
-[ast1]
-type=endpoint
-
-[ast1]
-type=inbound-publication
-event_asterisk-mwi=ast1
-
-[ast1]
-type=asterisk-publication
-mailbox_state=yes

Modified: asterisk/trunk/tests/channels/pjsip/publish/asterisk_event_mwi/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/pjsip/publish/asterisk_event_mwi/test-config.yaml?view=diff&rev=5578&r1=5577&r2=5578
==============================================================================
--- asterisk/trunk/tests/channels/pjsip/publish/asterisk_event_mwi/test-config.yaml (original)
+++ asterisk/trunk/tests/channels/pjsip/publish/asterisk_event_mwi/test-config.yaml Wed Sep 10 11:11:59 2014
@@ -88,93 +88,4 @@
                     Old: '0'
         count: '4'
         action: 'stop'
-testinfo:
-    summary: 'Test the nominal transmission and reception of inter-Asterisk message waiting SIP PUBLISHes.'
-    description: |
-        'Two Asterisk servers are started. Asterisk 1 transmits MWI PUBLISH requests to Asterisk 2. The
-        test succeeds if Asterisk 2 successfully receives and processes the PUBLISH requests. If Asterisk
-        2 does not emit MWI events or if the MWI events emitted do not have expected values, then the
-        test fails.'
 
-properties:
-    minversion: '13.0.0'
-    dependencies:
-        - python: 'twisted'
-        - python: 'starpy'
-        - asterisk: 'res_pjsip'
-        - asterisk: 'res_pjsip_outbound_publish'
-        - asterisk: 'res_pjsip_publish_asterisk'
-        - asterisk: 'res_mwi_external'
-        - asterisk: 'res_mwi_external_ami'
-    tags:
-        - pjsip
-        - mwi_external
-
-test-modules:
-    add-test-to-search-path: 'True'
-    test-object:
-        config-section: test-object-config
-        typename: 'test_case.TestCaseModule'
-    modules:
-        -
-            config-section: mwi-sender
-            typename: 'mwi_sender.MWISender'
-        -
-            config-section: mwi-receiver
-            typename: 'ami.AMIEventModule'
-
-test-object-config:
-    asterisk-instances: 2
-    connect-ami: True
-
-mwi-sender:
-    mailbox: 'bunny-rabbit'
-    messages:
-        -
-            new: '2'
-            old: '0'
-        -
-            new: '1'
-            old: '1'
-        -
-            new: '0'
-            old: '2'
-        -
-            new: '0'
-            old: '0'
-
-mwi-receiver:
-    -
-        id: '1'
-        type: 'orderedheadermatch'
-        conditions:
-            match:
-                Event: 'MessageWaiting'
-                Mailbox: 'bunny-rabbit'
-        requirements:
-            -
-                match:
-                # XXX Waiting should be '1' here, but we use '0' to work around
-                # an issue. See ASTERISK-24272
-                    Waiting: '0'
-                    New: '2'
-                    Old: '0'
-            -
-                match:
-                # XXX Waiting should be '1' here, but we use '0' to work around
-                # an issue. See ASTERISK-24272
-                    Waiting: '0'
-                    New: '1'
-                    Old: '1'
-            -
-                match:
-                    Waiting: '0'
-                    New: '0'
-                    Old: '2'
-            -
-                match:
-                    Waiting: '0'
-                    New: '0'
-                    Old: '0'
-        count: '4'
-        action: 'stop'