[asterisk-commits] Confbridge test failures due to scenarios sometimes ending t... (testsuite[master])
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Sun Oct 25 11:04:59 CDT 2015
Joshua Colp has submitted this change and it was merged.
Change subject: Confbridge test failures due to scenarios sometimes ending too early
......................................................................
Confbridge test failures due to scenarios sometimes ending too early
A few confbridge tests would sporadically fail because the scenario(s) would
end before all events had been processed. This happened because an "end"
scenario action was tied to a specific event, so once that event was received
it triggered the scenario to end. The test would end, but sometimes there
were available events still left to process.
This patch makes it so the test scenario will not end until all expected events
have been received and their actions have been run, or a timeout occurs. It
also makes it so that in the case when an event is received more than once any
actions are run only one time (upon reception of the first event).
Change-Id: I3e067f7cd80568c9b507ca850771040d5fe2f593
---
M lib/python/asterisk/apptest.py
M tests/apps/agents/agent_acknowledge/agent_acknowledge_error/test-config.yaml
M tests/apps/agents/agent_acknowledge/nominal/test-config.yaml
M tests/apps/agents/agent_login/login_errors/test-config.yaml
M tests/apps/agents/agent_login/nominal/test-config.yaml
M tests/apps/agents/agent_request/nominal/test-config.yaml
M tests/apps/authenticate/off_nominal/test-config.yaml
M tests/apps/bridge/bridge_wait/bridge_wait_e_options/test-config.yaml
M tests/apps/bridge/bridge_wait/bridge_wait_roles/test-config.yaml
M tests/apps/bridge/bridge_wait/bridge_wait_s_option/test-config.yaml
M tests/apps/channel_redirect/test-config.yaml
M tests/apps/confbridge/confbridge_dynamic_menus/test-config.yaml
M tests/apps/confbridge/confbridge_end_marked/test-config.yaml
M tests/apps/confbridge/confbridge_marked/test-config.yaml
M tests/apps/confbridge/confbridge_marked_unmarked/test-config.yaml
M tests/apps/confbridge/confbridge_result/test-config.yaml
M tests/apps/confbridge/confbridge_start_muted/test-config.yaml
M tests/apps/confbridge/confbridge_triple_lindy/test-config.yaml
M tests/apps/confbridge/confbridge_waitmarked_kick/test-config.yaml
M tests/apps/confbridge/confbridge_waitmarked_normal/test-config.yaml
M tests/apps/confbridge/confbridge_waitmarked_only/test-config.yaml
M tests/apps/confbridge/confbridge_waitmarked_single/test-config.yaml
M tests/apps/control_playback/control_forward/test-config.yaml
M tests/apps/control_playback/control_pause/test-config.yaml
M tests/apps/control_playback/control_restart/test-config.yaml
M tests/apps/control_playback/control_reverse/test-config.yaml
M tests/apps/control_playback/control_stop/test-config.yaml
M tests/apps/directed_pickup/pickup/test-config.yaml
M tests/apps/directory/directory_result/test-config.yaml
M tests/apps/disa/nominal/authenticate/test-config.yaml
M tests/apps/disa/nominal/no_authentication/test-config.yaml
M tests/apps/disa/nominal/no_context/test-config.yaml
M tests/apps/disa/off-nominal/bad_auth/test-config.yaml
M tests/apps/disa/off-nominal/invalid_exten/test-config.yaml
M tests/apps/page/page_predial/test-config.yaml
M tests/apps/playback/remote_forward/test-config.yaml
M tests/apps/playback/remote_pause/test-config.yaml
M tests/apps/playback/remote_restart/test-config.yaml
M tests/apps/playback/remote_reverse/test-config.yaml
M tests/apps/playback/remote_stop/test-config.yaml
M tests/apps/say_interrupt/test-config.yaml
M tests/bridge/atxfer_retries/test-config.yaml
M tests/pbx/ast_db/test-config.yaml
43 files changed, 40 insertions(+), 242 deletions(-)
Approvals:
Anonymous Coward #1000019: Verified
Joshua Colp: Looks good to me, approved
diff --git a/lib/python/asterisk/apptest.py b/lib/python/asterisk/apptest.py
index bb4d861..64b592d 100644
--- a/lib/python/asterisk/apptest.py
+++ b/lib/python/asterisk/apptest.py
@@ -158,6 +158,16 @@
self._run_scenario(self._scenarios.pop(0))
return result
+ def _is_scenario_done(self):
+ """Checks to see if a scenario has completed
+
+ A Scenario is considered done if all results have been met and
+ all expected actions have been executed.
+ """
+ return (all(self._expected_results.itervalues()) and
+ all(i.ran_actions or i.unexpected
+ for i in self._event_instances))
+
def get_channel_object(self, channel_id):
"""Get the ChannelObject associated with a channel name
@@ -185,7 +195,15 @@
expected_result The name of the result that occurred
"""
self._expected_results[expected_result] = True
- self.reset_timeout()
+ if self._is_scenario_done():
+ self.end_scenario()
+ else:
+ self.reset_timeout()
+
+ def event_instance_ran_actions(self):
+ """Raised when an event instance completes its actions"""
+ if self._is_scenario_done():
+ self.end_scenario()
class ChannelObject(object):
@@ -574,12 +592,19 @@
self.channel_id = channel_id
self.actions = []
+ self.ran_actions = False
+ self.unexpected = False
# create actions from the definitions
- for action_def in instance_config['actions']:
- action = ActionFactory.create_action(action_def)
- LOGGER.debug('Adding action %s, matching on %s' % (
- action, self.match_conditions))
- self.actions.append(action)
+ if 'actions' in instance_config:
+ for action_def in instance_config['actions']:
+ action = ActionFactory.create_action(action_def)
+ LOGGER.debug('Adding action %s, matching on %s' % (
+ action, self.match_conditions))
+ self.actions.append(action)
+ # if any associated action is a fail test action it's assumed
+ # that this event is an unexpected event (meaning the test
+ # scenario should never raise or see this event).
+ self.unexpected |= isinstance(action, ActionFailTest)
self.__current_action = 0
self.channel_obj = None
@@ -591,6 +616,9 @@
def event_callback(self, ami, event):
"""Override of AMIEventInstance event_callback."""
+ # if more than one matching event comes in don't re-run the actions
+ if self.ran_actions:
+ return
# If we aren't matching on a channel, then just execute the actions
if 'channel' not in event or len(self.channel_id) == 0:
@@ -609,9 +637,14 @@
def execute_next_action(self, result=None, actions=None):
"""Execute the next action in the sequence"""
-
if (not actions or len(actions) == 0):
self.__current_action = 0
+
+ self.ran_actions = True
+ # If an unexpected event was received end the scenario, otherwise
+ # notify the test object all event actions have been run
+ (self.test_object.end_scenario() if self.unexpected else
+ self.test_object.event_instance_ran_actions())
return
LOGGER.debug("Executing action %d on %s" %
@@ -784,20 +817,6 @@
return None
-class ActionEndScenario(object):
- """Functor that signals to the AppTest object that the scenario has ended"""
-
- def __init__(self, action_config):
- self.message = "Ending scenario..." if 'message' not in action_config \
- else action_config['message']
-
- def __call__(self, channel_object):
- test_object = AppTest.get_instance()
- LOGGER.info(self.message)
- test_object.end_scenario()
- return None
-
-
class ActionSendMessage(object):
"""Functor that sends some AMI message"""
@@ -836,7 +855,6 @@
'set-expected-result': ActionSetExpectedResult,
'hangup': ActionHangup,
'fail-test': ActionFailTest,
- 'end-scenario': ActionEndScenario,
'send-ami-message': ActionSendMessage, }
@staticmethod
diff --git a/tests/apps/agents/agent_acknowledge/agent_acknowledge_error/test-config.yaml b/tests/apps/agents/agent_acknowledge/agent_acknowledge_error/test-config.yaml
index 1f9501d..c42c971 100644
--- a/tests/apps/agents/agent_acknowledge/agent_acknowledge_error/test-config.yaml
+++ b/tests/apps/agents/agent_acknowledge/agent_acknowledge_error/test-config.yaml
@@ -100,8 +100,6 @@
-
action-type: 'hangup'
channel-id: 'Login-1000'
- -
- action-type: 'end-scenario'
-
type: 'headermatch'
conditions:
@@ -112,8 +110,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Agent 1000 logged off automatically.'
- -
- action-type: 'end-scenario'
-
channel-id: 'Request-1000'
channel-name: 'Local/request1000 at default'
@@ -220,8 +216,6 @@
-
action-type: 'hangup'
channel-id: 'Login-2000'
- -
- action-type: 'end-scenario'
-
type: 'headermatch'
conditions:
@@ -232,8 +226,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Agent 2000 logged off automatically.'
- -
- action-type: 'end-scenario'
-
channel-id: 'Request-2000'
channel-name: 'Local/request2000 at default'
diff --git a/tests/apps/agents/agent_acknowledge/nominal/test-config.yaml b/tests/apps/agents/agent_acknowledge/nominal/test-config.yaml
index ef76eb5..d7dcba3 100644
--- a/tests/apps/agents/agent_acknowledge/nominal/test-config.yaml
+++ b/tests/apps/agents/agent_acknowledge/nominal/test-config.yaml
@@ -152,8 +152,6 @@
-
action-type: 'hangup'
channel-id: 'Login-1000'
- -
- action-type: 'end-scenario'
-
# Scenario 2
# Exactly the same as scenario 1, but the accepted DTMF value should be '*'.
@@ -285,8 +283,6 @@
-
action-type: 'hangup'
channel-id: 'Login-2000'
- -
- action-type: 'end-scenario'
-
# Scenario 3
# Exactly the same as scenario 1, but a custom sound file will be played
@@ -363,8 +359,6 @@
-
action-type: 'set-expected-result'
expected-result: 'All channels hung up'
- -
- action-type: 'end-scenario'
-
channel-id: 'Request-3000'
channel-name: 'Local/request3000 at default'
diff --git a/tests/apps/agents/agent_login/login_errors/test-config.yaml b/tests/apps/agents/agent_login/login_errors/test-config.yaml
index acc5ce6..b3b5447 100644
--- a/tests/apps/agents/agent_login/login_errors/test-config.yaml
+++ b/tests/apps/agents/agent_login/login_errors/test-config.yaml
@@ -86,8 +86,6 @@
-
action-type: 'hangup'
channel-id: 'Valid-agent'
- -
- action-type: 'end-scenario'
-
type: 'headermatch'
conditions:
@@ -105,8 +103,6 @@
-
action-type: 'hangup'
channel-id: 'Valid-agent'
- -
- action-type: 'end-scenario'
-
type: 'headermatch'
conditions:
@@ -124,8 +120,6 @@
-
action-type: 'hangup'
channel-id: 'Valid-agent'
- -
- action-type: 'end-scenario'
-
type: 'headermatch'
conditions:
@@ -142,8 +136,6 @@
-
action-type: 'hangup'
channel-id: 'Valid-agent'
- -
- action-type: 'end-scenario'
-
# Scenario 2
# AgentLogin() receives an invalid agent.
@@ -168,8 +160,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Detected invalid agent 4321 and now hanging up.'
- -
- action-type: 'end-scenario'
-
type: 'headermatch'
conditions:
@@ -183,8 +173,6 @@
-
action-type: 'hangup'
channel-id: 'Invalid-agent'
- -
- action-type: 'end-scenario'
-
type: 'headermatch'
conditions:
@@ -199,8 +187,6 @@
-
action-type: 'hangup'
channel-id: 'Invalid-agent'
- -
- action-type: 'end-scenario'
-
type: 'headermatch'
conditions:
@@ -214,8 +200,6 @@
-
action-type: 'hangup'
channel-id: 'Invalid-agent'
- -
- action-type: 'end-scenario'
properties:
minversion: '12.0.0'
diff --git a/tests/apps/agents/agent_login/nominal/test-config.yaml b/tests/apps/agents/agent_login/nominal/test-config.yaml
index ea4b93c..6976f02 100644
--- a/tests/apps/agents/agent_login/nominal/test-config.yaml
+++ b/tests/apps/agents/agent_login/nominal/test-config.yaml
@@ -57,8 +57,6 @@
-
action-type: 'hangup'
channel-id: 'Valid-agent'
- -
- action-type: 'end-scenario'
properties:
minversion: '12.0.0'
diff --git a/tests/apps/agents/agent_request/nominal/test-config.yaml b/tests/apps/agents/agent_request/nominal/test-config.yaml
index 87fbc0d..f9ea713 100644
--- a/tests/apps/agents/agent_request/nominal/test-config.yaml
+++ b/tests/apps/agents/agent_request/nominal/test-config.yaml
@@ -180,8 +180,6 @@
-
action-type: 'hangup'
channel-id: 'Agent-login'
- -
- action-type: 'end-scenario'
properties:
minversion: '12.0.0'
diff --git a/tests/apps/authenticate/off_nominal/test-config.yaml b/tests/apps/authenticate/off_nominal/test-config.yaml
index 5fe0659..7bd78b9 100644
--- a/tests/apps/authenticate/off_nominal/test-config.yaml
+++ b/tests/apps/authenticate/off_nominal/test-config.yaml
@@ -58,9 +58,6 @@
State: 'PLAYBACK'
Channel: 'Local/start at default-.*'
Message: 'vm-goodbye'
- actions:
- -
- action-type: 'end-scenario'
properties:
minversion: '1.8.29.0'
diff --git a/tests/apps/bridge/bridge_wait/bridge_wait_e_options/test-config.yaml b/tests/apps/bridge/bridge_wait/bridge_wait_e_options/test-config.yaml
index b1293b3..b5709ae 100644
--- a/tests/apps/bridge/bridge_wait/bridge_wait_e_options/test-config.yaml
+++ b/tests/apps/bridge/bridge_wait/bridge_wait_e_options/test-config.yaml
@@ -38,8 +38,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Channel Hung Up'
- -
- action-type: 'end-scenario'
-
type: 'headermatch'
conditions:
@@ -74,8 +72,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Channel Hung Up'
- -
- action-type: 'end-scenario'
-
type: 'headermatch'
conditions:
@@ -143,8 +139,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Channel Hung Up'
- -
- action-type: 'end-scenario'
-
# Scenario 4: The e(s) test is identical to the e(n) test, yet it plays back
# silent audio instead of dead air. It also checks that no Hold or MoH Events
@@ -200,8 +194,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Channel Hung Up'
- -
- action-type: 'end-scenario'
-
# Scenario 5: The e(r) test verifies that the state of the channel changes
# to ringing by checking a Newstate event.
@@ -237,8 +229,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Channel Hung Up'
- -
- action-type: 'end-scenario'
-
# Scenario 6: The e(h) test checks to make sure that the channel is on
# hold through MoH events.
@@ -283,8 +273,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Channel Hung Up'
- -
- action-type: 'end-scenario'
properties:
minversion: '12.0.0'
diff --git a/tests/apps/bridge/bridge_wait/bridge_wait_roles/test-config.yaml b/tests/apps/bridge/bridge_wait/bridge_wait_roles/test-config.yaml
index a2194a9..451884b 100644
--- a/tests/apps/bridge/bridge_wait/bridge_wait_roles/test-config.yaml
+++ b/tests/apps/bridge/bridge_wait/bridge_wait_roles/test-config.yaml
@@ -98,8 +98,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Announcer channel hung up'
- -
- action-type: 'end-scenario'
properties:
minversion: '12.0.0'
diff --git a/tests/apps/bridge/bridge_wait/bridge_wait_s_option/test-config.yaml b/tests/apps/bridge/bridge_wait/bridge_wait_s_option/test-config.yaml
index 3d74ff8..355c73b 100644
--- a/tests/apps/bridge/bridge_wait/bridge_wait_s_option/test-config.yaml
+++ b/tests/apps/bridge/bridge_wait/bridge_wait_s_option/test-config.yaml
@@ -47,8 +47,6 @@
-
action-type: 'hangup'
delay: 1
- -
- action-type: 'end-scenario'
properties:
minversion: '12.0.0'
diff --git a/tests/apps/channel_redirect/test-config.yaml b/tests/apps/channel_redirect/test-config.yaml
index 1f11aff..96c6f92 100644
--- a/tests/apps/channel_redirect/test-config.yaml
+++ b/tests/apps/channel_redirect/test-config.yaml
@@ -95,8 +95,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Initiating channel hung up'
- -
- action-type: 'end-scenario'
-
# Scenario 2
# A local channel attempts to redirect a non-existent channel. CHANNELREDIRECT_STATUS
@@ -143,8 +141,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Null-initiate channel hung up'
- -
- action-type: 'end-scenario'
properties:
minversion: '1.8.0.0'
diff --git a/tests/apps/confbridge/confbridge_dynamic_menus/test-config.yaml b/tests/apps/confbridge/confbridge_dynamic_menus/test-config.yaml
index c55c959..ffb349b 100644
--- a/tests/apps/confbridge/confbridge_dynamic_menus/test-config.yaml
+++ b/tests/apps/confbridge/confbridge_dynamic_menus/test-config.yaml
@@ -43,8 +43,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Phase 0: Conference Ended'
- -
- action-type: 'end-scenario'
channels:
-
channel-id: 'SingleOption'
@@ -113,8 +111,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Phase 1: Conference Ended'
- -
- action-type: 'end-scenario'
channels:
-
channel-id: 'MultipleOptions'
@@ -199,8 +195,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Phase 2: Conference Ended'
- -
- action-type: 'end-scenario'
-
type: 'headermatch'
conditions:
@@ -312,8 +306,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Phase 3: Conference Ended'
- -
- action-type: 'end-scenario'
channels:
-
channel-id: 'MultipleOptions'
diff --git a/tests/apps/confbridge/confbridge_end_marked/test-config.yaml b/tests/apps/confbridge/confbridge_end_marked/test-config.yaml
index b6d9b75..7ea6ad5 100644
--- a/tests/apps/confbridge/confbridge_end_marked/test-config.yaml
+++ b/tests/apps/confbridge/confbridge_end_marked/test-config.yaml
@@ -118,8 +118,6 @@
action-type: 'set-expected-result'
delay: 2
expected-result: 'Conference Ended'
- -
- action-type: 'end-scenario'
channels:
-
channel-id: 'Waitmarked-user'
diff --git a/tests/apps/confbridge/confbridge_marked/test-config.yaml b/tests/apps/confbridge/confbridge_marked/test-config.yaml
index 3359057..1758d78 100644
--- a/tests/apps/confbridge/confbridge_marked/test-config.yaml
+++ b/tests/apps/confbridge/confbridge_marked/test-config.yaml
@@ -104,8 +104,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Conference Ended'
- -
- action-type: 'end-scenario'
channels:
-
channel-id: 'Marked-1'
@@ -290,8 +288,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Conference Ended'
- -
- action-type: 'end-scenario'
channels:
-
channel-id: 'Marked-1'
diff --git a/tests/apps/confbridge/confbridge_marked_unmarked/test-config.yaml b/tests/apps/confbridge/confbridge_marked_unmarked/test-config.yaml
index 13e4c8a..1d9b4a5 100644
--- a/tests/apps/confbridge/confbridge_marked_unmarked/test-config.yaml
+++ b/tests/apps/confbridge/confbridge_marked_unmarked/test-config.yaml
@@ -107,8 +107,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Conference Ended'
- -
- action-type: 'end-scenario'
channels:
-
channel-id: 'Marked-user'
@@ -300,8 +298,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Conference Ended'
- -
- action-type: 'end-scenario'
channels:
-
channel-id: 'Marked-user'
@@ -489,8 +485,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Conference Ended'
- -
- action-type: 'end-scenario'
channels:
-
channel-id: 'Marked-user'
diff --git a/tests/apps/confbridge/confbridge_result/test-config.yaml b/tests/apps/confbridge/confbridge_result/test-config.yaml
index b940e69..e78efd5 100644
--- a/tests/apps/confbridge/confbridge_result/test-config.yaml
+++ b/tests/apps/confbridge/confbridge_result/test-config.yaml
@@ -49,8 +49,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Conference Ended'
- -
- action-type: 'end-scenario'
channels:
-
channel-id: 'Alice'
@@ -261,8 +259,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Conference Ended'
- -
- action-type: 'end-scenario'
channels:
-
channel-id: 'Alice'
diff --git a/tests/apps/confbridge/confbridge_start_muted/test-config.yaml b/tests/apps/confbridge/confbridge_start_muted/test-config.yaml
index 8a48892..4164058 100644
--- a/tests/apps/confbridge/confbridge_start_muted/test-config.yaml
+++ b/tests/apps/confbridge/confbridge_start_muted/test-config.yaml
@@ -35,8 +35,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Conference Ended'
- -
- action-type: 'end-scenario'
channels:
-
channel-id: 'Alice'
diff --git a/tests/apps/confbridge/confbridge_triple_lindy/test-config.yaml b/tests/apps/confbridge/confbridge_triple_lindy/test-config.yaml
index 1b4d6b4..0ca97af 100644
--- a/tests/apps/confbridge/confbridge_triple_lindy/test-config.yaml
+++ b/tests/apps/confbridge/confbridge_triple_lindy/test-config.yaml
@@ -125,8 +125,6 @@
action-type: 'set-expected-result'
delay: 2
expected-result: 'Conference Ended'
- -
- action-type: 'end-scenario'
channels:
-
channel-id: 'Waitmarked-user'
@@ -384,8 +382,6 @@
action-type: 'set-expected-result'
delay: 2
expected-result: 'Conference Ended'
- -
- action-type: 'end-scenario'
channels:
-
channel-id: 'Waitmarked-user'
@@ -622,8 +618,6 @@
action-type: 'set-expected-result'
delay: 2
expected-result: 'Conference ended'
- -
- action-type: 'end-scenario'
-
type: 'headermatch'
conditions:
@@ -870,8 +864,6 @@
action-type: 'set-expected-result'
delay: 2
expected-result: 'Conference ended'
- -
- action-type: 'end-scenario'
-
type: 'headermatch'
conditions:
diff --git a/tests/apps/confbridge/confbridge_waitmarked_kick/test-config.yaml b/tests/apps/confbridge/confbridge_waitmarked_kick/test-config.yaml
index 11edfb9..0e59d41 100644
--- a/tests/apps/confbridge/confbridge_waitmarked_kick/test-config.yaml
+++ b/tests/apps/confbridge/confbridge_waitmarked_kick/test-config.yaml
@@ -102,8 +102,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Channels exited conference'
- -
- action-type: 'end-scenario'
channels:
-
channel-id: 'Marked'
diff --git a/tests/apps/confbridge/confbridge_waitmarked_normal/test-config.yaml b/tests/apps/confbridge/confbridge_waitmarked_normal/test-config.yaml
index 3da3986..8ea8b9a 100644
--- a/tests/apps/confbridge/confbridge_waitmarked_normal/test-config.yaml
+++ b/tests/apps/confbridge/confbridge_waitmarked_normal/test-config.yaml
@@ -103,8 +103,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Conference Ended'
- -
- action-type: 'end-scenario'
channels:
-
channel-id: 'Normal_user'
@@ -276,8 +274,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Conference Ended'
- -
- action-type: 'end-scenario'
channels:
-
channel-id: 'Normal_user'
@@ -454,8 +450,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Conference Ended'
- -
- action-type: 'end-scenario'
channels:
-
channel-id: 'Normal_user'
diff --git a/tests/apps/confbridge/confbridge_waitmarked_only/test-config.yaml b/tests/apps/confbridge/confbridge_waitmarked_only/test-config.yaml
index 59fb4b6..4083792 100644
--- a/tests/apps/confbridge/confbridge_waitmarked_only/test-config.yaml
+++ b/tests/apps/confbridge/confbridge_waitmarked_only/test-config.yaml
@@ -72,8 +72,6 @@
action-type: 'set-expected-result'
delay: 2
expected-result: 'Conference Ended'
- -
- action-type: 'end-scenario'
-
type: 'headermatch'
conditions:
diff --git a/tests/apps/confbridge/confbridge_waitmarked_single/test-config.yaml b/tests/apps/confbridge/confbridge_waitmarked_single/test-config.yaml
index ae18d20..2add17d 100644
--- a/tests/apps/confbridge/confbridge_waitmarked_single/test-config.yaml
+++ b/tests/apps/confbridge/confbridge_waitmarked_single/test-config.yaml
@@ -102,8 +102,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Conference Ended'
- -
- action-type: 'end-scenario'
channels:
-
channel-id: 'Marked'
@@ -253,8 +251,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Conference Ended'
- -
- action-type: 'end-scenario'
channels:
-
channel-id: 'Marked'
@@ -400,8 +396,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Conference Ended'
- -
- action-type: 'end-scenario'
channels:
-
channel-id: 'Marked'
diff --git a/tests/apps/control_playback/control_forward/test-config.yaml b/tests/apps/control_playback/control_forward/test-config.yaml
index 281a06a..e8e0973 100644
--- a/tests/apps/control_playback/control_forward/test-config.yaml
+++ b/tests/apps/control_playback/control_forward/test-config.yaml
@@ -85,9 +85,6 @@
match:
Event: 'Hangup'
Channel: 'Local/test_user at default-00000000;2'
- actions:
- -
- action-type: 'end-scenario'
-
# Scenario 2: Verify default values
channels:
@@ -150,9 +147,6 @@
match:
Event: 'Hangup'
Channel: 'Local/test_default_user at default-00000001;2'
- actions:
- -
- action-type: 'end-scenario'
-
# Scenario 3: Verify an AMI connection can control a playback
channels:
@@ -217,10 +211,6 @@
match:
Event: 'Hangup'
Channel: 'Local/test_remote at default-00000002;2'
- actions:
- -
- action-type: 'end-scenario'
-
properties:
minversion: '12.0.0'
diff --git a/tests/apps/control_playback/control_pause/test-config.yaml b/tests/apps/control_playback/control_pause/test-config.yaml
index 7b9b2fc..33b9e74 100644
--- a/tests/apps/control_playback/control_pause/test-config.yaml
+++ b/tests/apps/control_playback/control_pause/test-config.yaml
@@ -96,9 +96,6 @@
match:
Event: 'Hangup'
Channel: 'Local/test_user at default-00000000;2'
- actions:
- -
- action-type: 'end-scenario'
-
# Scenario 2: Verify an AMI connection can control a playback
channels:
@@ -179,10 +176,6 @@
match:
Event: 'Hangup'
Channel: 'Local/test_remote at default-00000001;2'
- actions:
- -
- action-type: 'end-scenario'
-
properties:
minversion: '12.0.0'
diff --git a/tests/apps/control_playback/control_restart/test-config.yaml b/tests/apps/control_playback/control_restart/test-config.yaml
index 1d2ae8c..cc2de63 100644
--- a/tests/apps/control_playback/control_restart/test-config.yaml
+++ b/tests/apps/control_playback/control_restart/test-config.yaml
@@ -80,9 +80,6 @@
match:
Event: 'Hangup'
Channel: 'Local/test_user at default-00000000;2'
- actions:
- -
- action-type: 'end-scenario'
-
# Scenario 3: Verify an AMI connection can control a playback
channels:
@@ -146,10 +143,6 @@
match:
Event: 'Hangup'
Channel: 'Local/test_remote at default-00000001;2'
- actions:
- -
- action-type: 'end-scenario'
-
properties:
minversion: '12.0.0'
diff --git a/tests/apps/control_playback/control_reverse/test-config.yaml b/tests/apps/control_playback/control_reverse/test-config.yaml
index 8d05dfb..c9c284a 100644
--- a/tests/apps/control_playback/control_reverse/test-config.yaml
+++ b/tests/apps/control_playback/control_reverse/test-config.yaml
@@ -85,9 +85,6 @@
match:
Event: 'Hangup'
Channel: 'Local/test_user at default-00000000;2'
- actions:
- -
- action-type: 'end-scenario'
-
# Scenario 2: Verify default values
channels:
@@ -150,9 +147,6 @@
match:
Event: 'Hangup'
Channel: 'Local/test_default_user at default-00000001;2'
- actions:
- -
- action-type: 'end-scenario'
-
# Scenario 3: Verify an AMI connection can control a playback
channels:
@@ -217,10 +211,6 @@
match:
Event: 'Hangup'
Channel: 'Local/test_remote at default-00000002;2'
- actions:
- -
- action-type: 'end-scenario'
-
properties:
minversion: '12.0.0'
diff --git a/tests/apps/control_playback/control_stop/test-config.yaml b/tests/apps/control_playback/control_stop/test-config.yaml
index 29c6ead..af39422 100644
--- a/tests/apps/control_playback/control_stop/test-config.yaml
+++ b/tests/apps/control_playback/control_stop/test-config.yaml
@@ -91,9 +91,6 @@
match:
Event: 'Hangup'
Channel: 'Local/test_user at default-00000000;2'
- actions:
- -
- action-type: 'end-scenario'
-
# Scenario 2: Verify an AMI connection can control a playback
channels:
@@ -157,10 +154,6 @@
match:
Event: 'Hangup'
Channel: 'Local/test_remote at default-00000001;2'
- actions:
- -
- action-type: 'end-scenario'
-
properties:
minversion: '12.0.0'
diff --git a/tests/apps/directed_pickup/pickup/test-config.yaml b/tests/apps/directed_pickup/pickup/test-config.yaml
index 02b576a..db75fe8 100644
--- a/tests/apps/directed_pickup/pickup/test-config.yaml
+++ b/tests/apps/directed_pickup/pickup/test-config.yaml
@@ -88,8 +88,6 @@
-
action-type: 'hangup'
delay: 1
- -
- action-type: 'end-scenario'
-
# Scenario 2
# A channel is set to a namedpickupgroup and dials an extension that rings constantly.
@@ -159,8 +157,6 @@
-
action-type: 'hangup'
delay: 1
- -
- action-type: 'end-scenario'
-
# Scenario 3
# An outgoing channel sets the channel variable PICKUPMARK to a certain value before the
@@ -230,8 +226,6 @@
-
action-type: 'hangup'
delay: 1
- -
- action-type: 'end-scenario'
properties:
minversion: '12.0.0'
diff --git a/tests/apps/directory/directory_result/test-config.yaml b/tests/apps/directory/directory_result/test-config.yaml
index 56f86ca..c3d6e75 100644
--- a/tests/apps/directory/directory_result/test-config.yaml
+++ b/tests/apps/directory/directory_result/test-config.yaml
@@ -43,8 +43,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Phase 0: Success'
- -
- action-type: 'end-scenario'
# Phase 1: Operator
-
channels:
@@ -83,8 +81,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Phase 1: Success'
- -
- action-type: 'end-scenario'
# Phase 2: Assistant
-
channels:
@@ -123,8 +119,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Phase 2: Success'
- -
- action-type: 'end-scenario'
# Phase 3: Select
-
channels:
@@ -168,8 +162,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Phase 3: Success'
- -
- action-type: 'end-scenario'
# Phase 4: Exit
-
channels:
@@ -213,8 +205,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Phase 4: Success'
- -
- action-type: 'end-scenario'
# Phase 5: Hangup
-
channels:
@@ -252,8 +242,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Phase 5: Success'
- -
- action-type: 'end-scenario'
# Phase 6: Fail due to extension not existing at the selected directory context
-
channels:
@@ -297,8 +285,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Phase 6: Success'
- -
- action-type: 'end-scenario'
properties:
minversion: '13.0.0'
diff --git a/tests/apps/disa/nominal/authenticate/test-config.yaml b/tests/apps/disa/nominal/authenticate/test-config.yaml
index f51c15d..9d502fb 100644
--- a/tests/apps/disa/nominal/authenticate/test-config.yaml
+++ b/tests/apps/disa/nominal/authenticate/test-config.yaml
@@ -52,8 +52,6 @@
expected-result: 'Channel entered extension successfully!'
-
action-type: 'hangup'
- -
- action-type: 'end-scenario'
-
type: 'headermatch'
conditions:
diff --git a/tests/apps/disa/nominal/no_authentication/test-config.yaml b/tests/apps/disa/nominal/no_authentication/test-config.yaml
index 70fac6c..5a4f4c7 100644
--- a/tests/apps/disa/nominal/no_authentication/test-config.yaml
+++ b/tests/apps/disa/nominal/no_authentication/test-config.yaml
@@ -67,9 +67,6 @@
match:
Event: 'Hangup'
Channel: 'Local/start at default-.*'
- actions:
- -
- action-type: 'end-scenario'
properties:
minversion: '1.8.0.0'
diff --git a/tests/apps/disa/nominal/no_context/test-config.yaml b/tests/apps/disa/nominal/no_context/test-config.yaml
index 9f2866d..4d314cf 100644
--- a/tests/apps/disa/nominal/no_context/test-config.yaml
+++ b/tests/apps/disa/nominal/no_context/test-config.yaml
@@ -67,9 +67,6 @@
match:
Event: 'Hangup'
Channel: 'Local/start at default-.*'
- actions:
- -
- action-type: 'end-scenario'
properties:
minversion: '1.8.0.0'
diff --git a/tests/apps/disa/off-nominal/bad_auth/test-config.yaml b/tests/apps/disa/off-nominal/bad_auth/test-config.yaml
index 2992f1e..7a1c948 100644
--- a/tests/apps/disa/off-nominal/bad_auth/test-config.yaml
+++ b/tests/apps/disa/off-nominal/bad_auth/test-config.yaml
@@ -54,6 +54,3 @@
match:
Event: 'Hangup'
Channel: 'Local/begin at default-.*'
- actions:
- -
- action-type: 'end-scenario'
diff --git a/tests/apps/disa/off-nominal/invalid_exten/test-config.yaml b/tests/apps/disa/off-nominal/invalid_exten/test-config.yaml
index 38d8af1..e98d832 100644
--- a/tests/apps/disa/off-nominal/invalid_exten/test-config.yaml
+++ b/tests/apps/disa/off-nominal/invalid_exten/test-config.yaml
@@ -67,9 +67,6 @@
match:
Event: 'Hangup'
Channel: 'Local/start at default-.*'
- actions:
- -
- action-type: 'end-scenario'
properties:
minversion: '1.8.0.0'
diff --git a/tests/apps/page/page_predial/test-config.yaml b/tests/apps/page/page_predial/test-config.yaml
index baf723f..7d09231 100644
--- a/tests/apps/page/page_predial/test-config.yaml
+++ b/tests/apps/page/page_predial/test-config.yaml
@@ -42,8 +42,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Phase 0 - All channels entered bridge. Hang up on bridge'
- -
- action-type: 'end-scenario'
#Phase 1: Predial Caller
-
@@ -79,8 +77,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Phase 1 - All channels entered bridge. Hang up on bridge'
- -
- action-type: 'end-scenario'
#Phase 2: Predial Callee (single channel)
-
@@ -118,8 +114,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Phase 2 - All channels entered bridge. Hang up on bridge'
- -
- action-type: 'end-scenario'
#Phase 3: Predial Callee (multiple channels)
-
@@ -168,8 +162,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Phase 3 - All channels entered bridge. Hang up on bridge'
- -
- action-type: 'end-scenario'
properties:
minversion: '13.0.0'
diff --git a/tests/apps/playback/remote_forward/test-config.yaml b/tests/apps/playback/remote_forward/test-config.yaml
index e2e9172..2e31735 100644
--- a/tests/apps/playback/remote_forward/test-config.yaml
+++ b/tests/apps/playback/remote_forward/test-config.yaml
@@ -63,10 +63,6 @@
match:
Event: 'Hangup'
Channel: 'Local/test_remote at default-00000000;2'
- actions:
- -
- action-type: 'end-scenario'
-
properties:
minversion: '12.0.0'
diff --git a/tests/apps/playback/remote_pause/test-config.yaml b/tests/apps/playback/remote_pause/test-config.yaml
index 75e53fb..d89a468 100644
--- a/tests/apps/playback/remote_pause/test-config.yaml
+++ b/tests/apps/playback/remote_pause/test-config.yaml
@@ -63,10 +63,6 @@
match:
Event: 'Hangup'
Channel: 'Local/test_remote at default-00000000;2'
- actions:
- -
- action-type: 'end-scenario'
-
properties:
minversion: '12.0.0'
diff --git a/tests/apps/playback/remote_restart/test-config.yaml b/tests/apps/playback/remote_restart/test-config.yaml
index ec47b1f..789763c 100644
--- a/tests/apps/playback/remote_restart/test-config.yaml
+++ b/tests/apps/playback/remote_restart/test-config.yaml
@@ -63,10 +63,6 @@
match:
Event: 'Hangup'
Channel: 'Local/test_remote at default-00000000;2'
- actions:
- -
- action-type: 'end-scenario'
-
properties:
minversion: '12.0.0'
diff --git a/tests/apps/playback/remote_reverse/test-config.yaml b/tests/apps/playback/remote_reverse/test-config.yaml
index d33483f..37f9a25 100644
--- a/tests/apps/playback/remote_reverse/test-config.yaml
+++ b/tests/apps/playback/remote_reverse/test-config.yaml
@@ -63,10 +63,6 @@
match:
Event: 'Hangup'
Channel: 'Local/test_remote at default-00000000;2'
- actions:
- -
- action-type: 'end-scenario'
-
properties:
minversion: '12.0.0'
diff --git a/tests/apps/playback/remote_stop/test-config.yaml b/tests/apps/playback/remote_stop/test-config.yaml
index 9b7317d..3740290 100644
--- a/tests/apps/playback/remote_stop/test-config.yaml
+++ b/tests/apps/playback/remote_stop/test-config.yaml
@@ -63,10 +63,6 @@
match:
Event: 'Hangup'
Channel: 'Local/test_remote at default-00000000;2'
- actions:
- -
- action-type: 'end-scenario'
-
properties:
minversion: '12.0.0'
diff --git a/tests/apps/say_interrupt/test-config.yaml b/tests/apps/say_interrupt/test-config.yaml
index b669215..bdff259 100644
--- a/tests/apps/say_interrupt/test-config.yaml
+++ b/tests/apps/say_interrupt/test-config.yaml
@@ -46,8 +46,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Phase 0 - Test Reached Completion Event'
- -
- action-type: 'end-scenario'
-
type: 'headermatch'
conditions:
@@ -178,8 +176,6 @@
-
action-type: 'set-expected-result'
expected-result: 'Phase 1 - Test Reached Completion Event'
- -
- action-type: 'end-scenario'
-
type: 'headermatch'
conditions:
diff --git a/tests/bridge/atxfer_retries/test-config.yaml b/tests/bridge/atxfer_retries/test-config.yaml
index c43c2ed..3c396ce 100644
--- a/tests/bridge/atxfer_retries/test-config.yaml
+++ b/tests/bridge/atxfer_retries/test-config.yaml
@@ -113,8 +113,6 @@
-
action-type: 'send-ami-message'
fields: {'Channel': '/.*/'}
- -
- action-type: 'end-scenario'
-
# Call 2. See testinfo description for details.
channels:
@@ -184,8 +182,6 @@
fields:
Action: 'Hangup'
Channel: '/^Local/.*$/'
- -
- action-type: 'end-scenario'
properties:
diff --git a/tests/pbx/ast_db/test-config.yaml b/tests/pbx/ast_db/test-config.yaml
index 92218c6..b3d1dd6 100644
--- a/tests/pbx/ast_db/test-config.yaml
+++ b/tests/pbx/ast_db/test-config.yaml
@@ -152,8 +152,6 @@
-
action-type: 'set-expected-result'
expected-result: 'S3 is hanging up'
- -
- action-type: 'end-scenario'
properties:
minversion: '11.0.0'
--
To view, visit https://gerrit.asterisk.org/1390
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3e067f7cd80568c9b507ca850771040d5fe2f593
Gerrit-PatchSet: 2
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Matt Jordan <mjordan at digium.com>
More information about the asterisk-commits
mailing list