[asterisk-commits] dlee: branch dlee/ari-bridge-tests r4149 - in /asterisk/team/dlee/ari-bridge-...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Sep 10 13:47:25 CDT 2013
Author: dlee
Date: Tue Sep 10 13:47:22 2013
New Revision: 4149
URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=4149
Log:
Merged revisions 4069-4141 from http://svn.asterisk.org/svn/testsuite/asterisk/trunk
Added:
asterisk/team/dlee/ari-bridge-tests/tests/bridge/parkcall_timeout/comebacktoorigin_no/configs/ast1/res_parking.conf
- copied unchanged from r4141, asterisk/trunk/tests/bridge/parkcall_timeout/comebacktoorigin_no/configs/ast1/res_parking.conf
asterisk/team/dlee/ari-bridge-tests/tests/bridge/parkcall_timeout/comebacktoorigin_yes/configs/ast1/res_parking.conf
- copied unchanged from r4141, asterisk/trunk/tests/bridge/parkcall_timeout/comebacktoorigin_yes/configs/ast1/res_parking.conf
asterisk/team/dlee/ari-bridge-tests/tests/callparking_retrieval/configs/
- copied from r4141, asterisk/trunk/tests/callparking_retrieval/configs/
asterisk/team/dlee/ari-bridge-tests/tests/channels/SIP/sip_hold_direct_media/sipp/phone_A_IP_restrict.xml
- copied unchanged from r4141, asterisk/trunk/tests/channels/SIP/sip_hold_direct_media/sipp/phone_A_IP_restrict.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/outgoing/
- copied from r4141, asterisk/trunk/tests/channels/pjsip/basic_calls/outgoing/
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/two_parties/
- copied from r4141, asterisk/trunk/tests/channels/pjsip/basic_calls/two_parties/
asterisk/team/dlee/ari-bridge-tests/tests/masquerade/configs/ast1/res_parking.conf
- copied unchanged from r4141, asterisk/trunk/tests/masquerade/configs/ast1/res_parking.conf
Removed:
asterisk/team/dlee/ari-bridge-tests/tests/apps/queues/position_priority_maxlen/test.lua
asterisk/team/dlee/ari-bridge-tests/tests/callparking_retrieval/userA/
asterisk/team/dlee/ari-bridge-tests/tests/callparking_retrieval/userB/
asterisk/team/dlee/ari-bridge-tests/tests/callparking_retrieval/userC/
asterisk/team/dlee/ari-bridge-tests/tests/channels/SIP/sip_hold_direct_media/sipp/inject_bypass.csv
Modified:
asterisk/team/dlee/ari-bridge-tests/ (props changed)
asterisk/team/dlee/ari-bridge-tests/configs/cdr.conf
asterisk/team/dlee/ari-bridge-tests/configs/logger.conf
asterisk/team/dlee/ari-bridge-tests/lib/python/asterisk/BridgeTestCase.py
asterisk/team/dlee/ari-bridge-tests/lib/python/asterisk/SimpleTestCase.py
asterisk/team/dlee/ari-bridge-tests/lib/python/asterisk/cdr.py
asterisk/team/dlee/ari-bridge-tests/tests/apps/confbridge/confbridge_nominal/run-test
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_answer/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_busy/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_congestion/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_hangup/hangup.py
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_no_answer/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/configs/ast1/extensions.conf
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/charlie.xml
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_busy/configs/ast1/extensions.conf
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_busy/sipp/charlie.xml
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/configs/ast1/extensions.conf
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/sipp/charlie.xml
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/configs/ast1/extensions.conf
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/sipp/charlie.xml
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/configs/ast1/extensions.conf
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/sipp/charlie.xml
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_timeout/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_unavail/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/apps/queues/position_priority_maxlen/configs/ast1/extensions.conf
asterisk/team/dlee/ari-bridge-tests/tests/apps/queues/position_priority_maxlen/run-test
asterisk/team/dlee/ari-bridge-tests/tests/apps/queues/queue_all_paused_no_answer/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/apps/queues/queue_baseline/run-test
asterisk/team/dlee/ari-bridge-tests/tests/apps/queues/queue_no_answer/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/apps/queues/queue_one_paused_no_answer/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/apps/queues/set_penalty/run-test
asterisk/team/dlee/ari-bridge-tests/tests/asyncagi/asyncagi_break/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/bridge/dial_LS_options/Tester.py
asterisk/team/dlee/ari-bridge-tests/tests/bridge/parkcall_timeout/comebacktoorigin_no/Executioner.py
asterisk/team/dlee/ari-bridge-tests/tests/bridge/parkcall_timeout/comebacktoorigin_no/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/bridge/parkcall_timeout/comebacktoorigin_yes/Executioner.py
asterisk/team/dlee/ari-bridge-tests/tests/bridge/parkcall_timeout/comebacktoorigin_yes/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/callparking_retrieval/run-test
asterisk/team/dlee/ari-bridge-tests/tests/callparking_retrieval/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/cdr/batch_cdrs/configs/ast1/extensions.conf
asterisk/team/dlee/ari-bridge-tests/tests/cdr/batch_cdrs/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/cdr/cdr_manipulation/cdr_fork_end_time/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/cdr/cdr_manipulation/console_fork_after_busy_forward/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/cdr/cdr_manipulation/console_fork_before_dial/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/cdr/cdr_originate_sip_congestion_log/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/cdr/cdr_properties/cdr_accountcode/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/cdr/cdr_properties/cdr_userfield/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/cdr/cdr_unanswered_yes/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/cdr/console_dial_sip_answer/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/cdr/console_dial_sip_busy/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/cdr/console_dial_sip_congestion/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/cdr/console_dial_sip_transfer/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/channels/SIP/alwaysauthreject/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/channels/SIP/refer_replaces_to_self/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/channels/SIP/sip_custom_presence/multiple_state_change/run-test
asterisk/team/dlee/ari-bridge-tests/tests/channels/SIP/sip_hold/sipp/phone_A.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/SIP/sip_hold/sipp/phone_B_IP_media_restrict.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/SIP/sip_hold/sipp/phone_B_IP_restrict.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/SIP/sip_hold/sipp/phone_B_media_restrict.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/SIP/sip_hold_direct_media/run-test
asterisk/team/dlee/ari-bridge-tests/tests/channels/SIP/sip_hold_direct_media/sipp/phone_A.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/SIP/sip_hold_direct_media/sipp/phone_B_IP_media_restrict.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/SIP/sip_hold_direct_media/sipp/phone_B_IP_restrict.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/SIP/sip_hold_direct_media/sipp/phone_B_media_restrict.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/SIP/sip_one_legged_transfer/run-test
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_host/configs/ast1/pjsip.conf
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_host/sipp/echo_with_deferred_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_host/sipp/echo_with_initial_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_host/sipp/playback_with_deferred_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_host/sipp/playback_with_initial_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_host/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user/configs/ast1/pjsip.conf
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user/sipp/echo_with_deferred_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user/sipp/echo_with_initial_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user/sipp/playback_with_deferred_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user/sipp/playback_with_initial_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_host/configs/ast1/pjsip.conf
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_host/sipp/echo_with_deferred_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_host/sipp/echo_with_initial_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_host/sipp/playback_with_deferred_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_host/sipp/playback_with_initial_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_host/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user/configs/ast1/pjsip.conf
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user/sipp/echo_with_deferred_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user/sipp/echo_with_initial_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user/sipp/playback_with_deferred_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user/sipp/playback_with_initial_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_host/configs/ast1/pjsip.conf
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_host/sipp/echo_with_deferred_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_host/sipp/echo_with_initial_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_host/sipp/playback_with_deferred_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_host/sipp/playback_with_initial_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_host/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user/configs/ast1/pjsip.conf
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user/sipp/echo_with_deferred_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user/sipp/echo_with_initial_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user/sipp/playback_with_deferred_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user/sipp/playback_with_initial_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/incoming/nominal/unauthed/ident_by_user/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/basic_calls/tests.yaml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/incoming_calls_without_auth/configs/ast1/pjsip.conf
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/incoming_calls_without_auth/sipp/echo_with_deferred_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/incoming_calls_without_auth/sipp/echo_with_initial_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/incoming_calls_without_auth/sipp/incompatible_codecs.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/incoming_calls_without_auth/sipp/playback_with_deferred_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/incoming_calls_without_auth/sipp/playback_with_initial_sdp.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/incoming_calls_without_auth/sipp/unknown_destination.xml
asterisk/team/dlee/ari-bridge-tests/tests/channels/pjsip/incoming_calls_without_auth/test-config.yaml
asterisk/team/dlee/ari-bridge-tests/tests/fastagi/control-stream-file/run-test
asterisk/team/dlee/ari-bridge-tests/tests/masquerade/configs/ast1/extensions.conf
asterisk/team/dlee/ari-bridge-tests/tests/masquerade/run-test
Propchange: asterisk/team/dlee/ari-bridge-tests/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Sep 10 13:47:22 2013
@@ -1,1 +1,1 @@
-/asterisk/trunk:1-4065
+/asterisk/trunk:1-4148
Modified: asterisk/team/dlee/ari-bridge-tests/configs/cdr.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/configs/cdr.conf?view=diff&rev=4149&r1=4148&r2=4149
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/configs/cdr.conf (original)
+++ asterisk/team/dlee/ari-bridge-tests/configs/cdr.conf Tue Sep 10 13:47:22 2013
@@ -1,6 +1,5 @@
[general]
unanswered=no
-debug=yes
[csv]
usegmtime=yes
Modified: asterisk/team/dlee/ari-bridge-tests/configs/logger.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/configs/logger.conf?view=diff&rev=4149&r1=4148&r2=4149
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/configs/logger.conf (original)
+++ asterisk/team/dlee/ari-bridge-tests/configs/logger.conf Tue Sep 10 13:47:22 2013
@@ -8,6 +8,6 @@
[logfiles]
console => verbose
-messages.txt => notice,warning,error,verbose
+messages.txt => notice,warning,error,dtmf,verbose
full.txt => *
#include "logger.logfiles.conf.inc"
Modified: asterisk/team/dlee/ari-bridge-tests/lib/python/asterisk/BridgeTestCase.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/lib/python/asterisk/BridgeTestCase.py?view=diff&rev=4149&r1=4148&r2=4149
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/lib/python/asterisk/BridgeTestCase.py (original)
+++ asterisk/team/dlee/ari-bridge-tests/lib/python/asterisk/BridgeTestCase.py Tue Sep 10 13:47:22 2013
@@ -223,11 +223,13 @@
if self.uut_bridge_id != event.get('bridgeuniqueid'):
return
- if self.uut_alice_channel is None:
- self.uut_alice_channel = event.get('channel')
+ channel = event.get('channel')
+
+ if 'alice' in channel and self.uut_alice_channel is None:
+ self.uut_alice_channel = channel
LOGGER.info('UUT Alice Channel: %s' % self.uut_alice_channel)
- elif self.uut_bob_channel is None:
- self.uut_bob_channel = event.get('channel')
+ elif 'bob' in channel and self.uut_bob_channel is None:
+ self.uut_bob_channel = channel
LOGGER.info('UUT Bob Channel: %s' % self.uut_bob_channel)
LOGGER.debug("Bridge is up between %s and %s"
% (self.uut_alice_channel, self.uut_bob_channel))
Modified: asterisk/team/dlee/ari-bridge-tests/lib/python/asterisk/SimpleTestCase.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/lib/python/asterisk/SimpleTestCase.py?view=diff&rev=4149&r1=4148&r2=4149
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/lib/python/asterisk/SimpleTestCase.py (original)
+++ asterisk/team/dlee/ari-bridge-tests/lib/python/asterisk/SimpleTestCase.py Tue Sep 10 13:47:22 2013
@@ -10,6 +10,8 @@
import sys
import logging
import uuid
+
+from twisted.internet import reactor
sys.path.append("lib/python")
from TestCase import TestCase
@@ -44,6 +46,7 @@
self._ignore_originate_failures = False
self._spawn_after_hangup = False
self._config_path = None
+ self._end_test_delay = 0
if test_config is None or 'test-iterations' not in test_config:
# No special test configuration defined, use defaults
@@ -64,6 +67,8 @@
self._spawn_after_hangup = test_config['spawn-after-hangup']
if 'config-path' in test_config:
self._config_path = test_config['config-path']
+ self._end_test_delay = test_config.get('end-test-delay') or 0
+
self.create_asterisk(count=1, base_configs_path=self._config_path)
def ami_connect(self, ami):
@@ -95,20 +100,24 @@
# unique ID we've assigned, allowing us to associate the Asterisk
# channel name with the channel we originated
msg = "Originating call to %s" % call_details['channel']
+ if 'async' not in call_details:
+ call_details['async'] = False
if 'application' in call_details:
msg += " with application %s" % call_details['application']
- df = ami.originate(channel = call_details['channel'],
- application = call_details['application'],
- variable = call_details['variable'])
+ df = ami.originate(channel=call_details['channel'],
+ application=call_details['application'],
+ variable=call_details['variable'],
+ async=call_details['async'])
else:
msg += " to %s@%s at %s" % (call_details['exten'],
call_details['context'],
call_details['priority'],)
- df = ami.originate(channel = call_details['channel'],
- context = call_details['context'],
- exten = call_details['exten'],
- priority = call_details['priority'],
- variable = call_details['variable'])
+ df = ami.originate(channel=call_details['channel'],
+ context=call_details['context'],
+ exten=call_details['exten'],
+ priority=call_details['priority'],
+ variable=call_details['variable'],
+ async=call_details['async'])
if self._ignore_originate_failures:
df.addErrback(__swallow_originate_error)
else:
@@ -162,7 +171,7 @@
self.__originate_call(ami, self._test_runs[self._current_run])
else:
LOGGER.info("All calls executed, stopping")
- self.stop_reactor()
+ reactor.callLater(self._end_test_delay, self.stop_reactor)
def __event_cb(self, ami, event):
@@ -192,7 +201,7 @@
''' Called when an error occurs during a hangup '''
# Ignore the hangup error - in this case, the channel was disposed of
# prior to our hangup request, which is okay
- self.stop_reactor()
+ reactor.callLater(self._end_test_delay, self.stop_reactor)
def verify_event(self, event):
''' Virtual method used to verify values in the event. '''
Modified: asterisk/team/dlee/ari-bridge-tests/lib/python/asterisk/cdr.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/lib/python/asterisk/cdr.py?view=diff&rev=4149&r1=4148&r2=4149
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/lib/python/asterisk/cdr.py (original)
+++ asterisk/team/dlee/ari-bridge-tests/lib/python/asterisk/cdr.py Tue Sep 10 13:47:22 2013
@@ -61,7 +61,10 @@
callback_param
'''
LOGGER.debug("Checking CDR records...")
- self.match_cdrs()
+ try:
+ self.match_cdrs()
+ except:
+ LOGGER.error("Exception while checking CDRs: %s" % sys.exc_info()[0])
return callback_param
Modified: asterisk/team/dlee/ari-bridge-tests/tests/apps/confbridge/confbridge_nominal/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/tests/apps/confbridge/confbridge_nominal/run-test?view=diff&rev=4149&r1=4148&r2=4149
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/tests/apps/confbridge/confbridge_nominal/run-test (original)
+++ asterisk/team/dlee/ari-bridge-tests/tests/apps/confbridge/confbridge_nominal/run-test Tue Sep 10 13:47:22 2013
@@ -52,10 +52,13 @@
channel = ""
if 'channel' in event:
channel = event['channel']
- if "Bridge" in channel:
+ if "Bridge" in channel or "CBAnn" in channel:
self.__bridge_channel = channel
if state == 'PLAYBACK' and channel != "":
playfile = event.get('message')
+ if playfile is None:
+ # This isn't a message playback
+ return
if playfile == 'conf-getpin':
self.__handle_pin(channel)
elif playfile == 'vm-rec-name':
@@ -162,6 +165,9 @@
self.testCase.expectedEvents['adminunmuted'] = True
elif state == 'PLAYBACK' and channel != "":
playfile = event.get('message')
+ if playfile is None:
+ # This isn't a message playback
+ return
if playfile == 'conf-hasleft':
self.__left_notifications += 1
if (self.__left_notifications == 2):
Modified: asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_answer/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_answer/test-config.yaml?view=diff&rev=4149&r1=4148&r2=4149
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_answer/test-config.yaml (original)
+++ asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_answer/test-config.yaml Tue Sep 10 13:47:22 2013
@@ -133,6 +133,7 @@
application: 'Echo'
ignore-originate-failure: 'yes'
trigger: 'ami_connect'
+ async: True
sipp-config:
fail-on-any: True
Modified: asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_busy/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_busy/test-config.yaml?view=diff&rev=4149&r1=4148&r2=4149
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_busy/test-config.yaml (original)
+++ asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_busy/test-config.yaml Tue Sep 10 13:47:22 2013
@@ -117,6 +117,7 @@
application: 'Echo'
ignore-originate-failure: 'yes'
trigger: 'scenario_start'
+ async: True
sipp-config:
fail-on-any: True
Modified: asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_congestion/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_congestion/test-config.yaml?view=diff&rev=4149&r1=4148&r2=4149
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_congestion/test-config.yaml (original)
+++ asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_congestion/test-config.yaml Tue Sep 10 13:47:22 2013
@@ -117,6 +117,7 @@
application: 'Echo'
ignore-originate-failure: 'yes'
trigger: 'scenario_start'
+ async: True
sipp-config:
fail-on-any: True
Modified: asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_hangup/hangup.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_hangup/hangup.py?view=diff&rev=4149&r1=4148&r2=4149
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_hangup/hangup.py (original)
+++ asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_hangup/hangup.py Tue Sep 10 13:47:22 2013
@@ -8,6 +8,8 @@
import logging
+from twisted.internet import reactor
+
LOGGER = logging.getLogger(__name__)
def send_hangup(ami, event):
@@ -16,6 +18,6 @@
channel = event['channel']
LOGGER.info('Hanging up channel %s' % channel)
- ami.hangup(channel)
+ reactor.callLater(2, ami.hangup, channel)
return True
Modified: asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_no_answer/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_no_answer/test-config.yaml?view=diff&rev=4149&r1=4148&r2=4149
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_no_answer/test-config.yaml (original)
+++ asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_no_answer/test-config.yaml Tue Sep 10 13:47:22 2013
@@ -117,6 +117,7 @@
application: 'Echo'
ignore-originate-failure: 'yes'
trigger: 'scenario_start'
+ async: True
sipp-config:
fail-on-any: True
Modified: asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml?view=diff&rev=4149&r1=4148&r2=4149
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml (original)
+++ asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml Tue Sep 10 13:47:22 2013
@@ -196,6 +196,7 @@
application: 'Echo'
ignore-originate-failure: 'yes'
trigger: 'ami_connect'
+ async: True
sipp-config:
fail-on-any: True
Modified: asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml?view=diff&rev=4149&r1=4148&r2=4149
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml (original)
+++ asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml Tue Sep 10 13:47:22 2013
@@ -196,6 +196,7 @@
application: 'Echo'
ignore-originate-failure: 'yes'
trigger: 'ami_connect'
+ async: True
sipp-config:
fail-on-any: True
Modified: asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml?view=diff&rev=4149&r1=4148&r2=4149
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml (original)
+++ asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml Tue Sep 10 13:47:22 2013
@@ -196,6 +196,7 @@
application: 'Echo'
ignore-originate-failure: 'yes'
trigger: 'ami_connect'
+ async: True
sipp-config:
fail-on-any: True
Modified: asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml?view=diff&rev=4149&r1=4148&r2=4149
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml (original)
+++ asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml Tue Sep 10 13:47:22 2013
@@ -196,6 +196,7 @@
application: 'Echo'
ignore-originate-failure: 'yes'
trigger: 'ami_connect'
+ async: True
sipp-config:
fail-on-any: True
Modified: asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/configs/ast1/extensions.conf?view=diff&rev=4149&r1=4148&r2=4149
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/configs/ast1/extensions.conf (original)
+++ asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/configs/ast1/extensions.conf Tue Sep 10 13:47:22 2013
@@ -7,6 +7,9 @@
exten => apply_handler,1,NoOp()
same => n,Set(CHANNEL(hangup_handler_push)=handler,s,1)
same => n,Return()
+
+exten => echo,1,NoCDR()
+ same => n,Echo()
[handler]
Modified: asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/charlie.xml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/charlie.xml?view=diff&rev=4149&r1=4148&r2=4149
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/charlie.xml (original)
+++ asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/sipp/charlie.xml Tue Sep 10 13:47:22 2013
@@ -78,7 +78,7 @@
crlf="true">
</recv>
- <pause/>
+ <pause milliseconds="2000" />
<send retrans="500">
<![CDATA[
Modified: asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml?view=diff&rev=4149&r1=4148&r2=4149
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml (original)
+++ asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml Tue Sep 10 13:47:22 2013
@@ -54,31 +54,11 @@
lastapp: 'Dial'
disposition: 'ANSWERED'
amaflags: 'DOCUMENTATION'
- -
- accountcode: ''
- destination: 's'
- dcontext: 'default'
- callerid: ''
- channel: 'Local/s at default-.{8};1'
- dchannel: ''
- lastapp: 'Echo'
- disposition: 'ANSWERED'
- amaflags: 'DOCUMENTATION'
cdr-config-12:
-
file: 'Master'
lines:
- -
- accountcode: ''
- destination: 's'
- dcontext: 'default'
- callerid: '"" <>'
- channel: 'Local/s at default-.{8};1'
- dchannel: ''
- lastapp: 'Echo'
- disposition: 'ANSWERED'
- amaflags: 'DOCUMENTATION'
-
accountcode: ''
destination: 's'
@@ -218,9 +198,12 @@
originator-config:
channel: 'Local/s at default'
- application: 'Echo'
+ context: 'default'
+ exten: 'echo'
+ priority: 1
ignore-originate-failure: 'yes'
trigger: 'ami_connect'
+ async: True
sipp-config:
fail-on-any: True
Modified: asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_busy/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_busy/configs/ast1/extensions.conf?view=diff&rev=4149&r1=4148&r2=4149
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_busy/configs/ast1/extensions.conf (original)
+++ asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_busy/configs/ast1/extensions.conf Tue Sep 10 13:47:22 2013
@@ -7,6 +7,9 @@
exten => apply_handler,1,NoOp()
same => n,Set(CHANNEL(hangup_handler_push)=handler,s,1)
same => n,Return()
+
+exten => echo,1,NoCDR()
+ same => n,Echo()
[handler]
Modified: asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_busy/sipp/charlie.xml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_busy/sipp/charlie.xml?view=diff&rev=4149&r1=4148&r2=4149
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_busy/sipp/charlie.xml (original)
+++ asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_busy/sipp/charlie.xml Tue Sep 10 13:47:22 2013
@@ -78,7 +78,7 @@
crlf="true">
</recv>
- <pause/>
+ <pause milliseconds="2000" />
<send retrans="500">
<![CDATA[
Modified: asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml?view=diff&rev=4149&r1=4148&r2=4149
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml (original)
+++ asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml Tue Sep 10 13:47:22 2013
@@ -53,31 +53,11 @@
lastapp: 'Dial'
disposition: 'ANSWERED'
amaflags: 'DOCUMENTATION'
- -
- accountcode: ''
- destination: 's'
- dcontext: 'default'
- callerid: ''
- channel: 'Local/s at default-.{8};1'
- dchannel: ''
- lastapp: 'Echo'
- disposition: 'ANSWERED'
- amaflags: 'DOCUMENTATION'
cdr-config-12:
-
file: 'Master'
lines:
- -
- accountcode: ''
- destination: 's'
- dcontext: 'default'
- callerid: '"" <>'
- channel: 'Local/s at default-.{8};1'
- dchannel: ''
- lastapp: 'Echo'
- disposition: 'ANSWERED'
- amaflags: 'DOCUMENTATION'
-
accountcode: ''
destination: 's'
@@ -213,9 +193,12 @@
originator-config:
channel: 'Local/s at default'
- application: 'Echo'
+ context: 'default'
+ exten: 'echo'
+ priority: 1
ignore-originate-failure: 'yes'
trigger: 'ami_connect'
+ async: True
sipp-config:
fail-on-any: True
Modified: asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/configs/ast1/extensions.conf?view=diff&rev=4149&r1=4148&r2=4149
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/configs/ast1/extensions.conf (original)
+++ asterisk/team/dlee/ari-bridge-tests/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/configs/ast1/extensions.conf Tue Sep 10 13:47:22 2013
@@ -7,6 +7,9 @@
exten => apply_handler,1,NoOp()
[... 5161 lines stripped ...]
More information about the asterisk-commits
mailing list