[Asterisk-code-review] confbridge recording: test can fail due to late CONF START R... (testsuite[13])

[Jenkins2]

Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/10182 )

Change subject: confbridge_recording: test can fail due to late CONF_START_RECORD event
......................................................................

confbridge_recording: test can fail due to late CONF_START_RECORD event

The test is set to change from a "start" state to an "active" state once the
channel joins the confbridge. The test also expects the CONF_START_RECORD event
to be in the "start" state, but if the channel joins the confbridge first, the
state changes and the event arrives in the "active" state.

That being the case this patch makes it so the CONF_START_RECORD event is also
checked for in the "active" state since it doesn't care when it arrives just
if it does.

Change-Id: If76b4613b79fdc60ebd4fe48a144de6b556bfb79
---
M tests/apps/confbridge/confbridge_recording/run-test
1 file changed, 8 insertions(+), 2 deletions(-)

Approvals:
  George Joseph: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved
  Jenkins2: Approved for Submit



diff --git a/tests/apps/confbridge/confbridge_recording/run-test b/tests/apps/confbridge/confbridge_recording/run-test
index ec4a5bb..df5ef43 100755
--- a/tests/apps/confbridge/confbridge_recording/run-test
+++ b/tests/apps/confbridge/confbridge_recording/run-test
@@ -82,7 +82,8 @@
 
         state = event['state']
         if state == 'CONF_START_RECORD':
-            logger.debug("Detected CONF_START_RECORD")
+            logger.debug("State: {0} - Detected CONF_START_RECORD".format(
+                self.get_state_name()))
             self.test_case.expected_events['recordingstarted'] = True
 
     def get_state_name(self):
@@ -126,7 +127,12 @@
         """ TestEvent handler.  Check for end of recording. """
 
         state = event['state']
-        if state == 'CONF_STOP_RECORD':
+
+        if state == 'CONF_START_RECORD':
+            logger.debug("State: {0} - Detected CONF_START_RECORD".format(
+                self.get_state_name()))
+            self.test_case.expected_events['recordingstarted'] = True
+        elif state == 'CONF_STOP_RECORD':
             logger.debug("Detected CONF_STOP_RECORD")
             self.test_case.expected_events['recordingstopped'] = True
 

-- 
To view, visit https://gerrit.asterisk.org/10182
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: testsuite
Gerrit-Branch: 13
Gerrit-MessageType: merged
Gerrit-Change-Id: If76b4613b79fdc60ebd4fe48a144de6b556bfb79
Gerrit-Change-Number: 10182
Gerrit-PatchSet: 1
Gerrit-Owner: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180921/735795b6/attachment.html>