<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/10184">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  George Joseph: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved
  Jenkins2: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">confbridge_recording: test can fail due to late CONF_START_RECORD event<br><br>The test is set to change from a "start" state to an "active" state once the<br>channel joins the confbridge. The test also expects the CONF_START_RECORD event<br>to be in the "start" state, but if the channel joins the confbridge first, the<br>state changes and the event arrives in the "active" state.<br><br>That being the case this patch makes it so the CONF_START_RECORD event is also<br>checked for in the "active" state since it doesn't care when it arrives just<br>if it does.<br><br>Change-Id: If76b4613b79fdc60ebd4fe48a144de6b556bfb79<br>---<br>M tests/apps/confbridge/confbridge_recording/run-test<br>1 file changed, 8 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/apps/confbridge/confbridge_recording/run-test b/tests/apps/confbridge/confbridge_recording/run-test</span><br><span>index ec4a5bb..df5ef43 100755</span><br><span>--- a/tests/apps/confbridge/confbridge_recording/run-test</span><br><span>+++ b/tests/apps/confbridge/confbridge_recording/run-test</span><br><span>@@ -82,7 +82,8 @@</span><br><span> </span><br><span>         state = event['state']</span><br><span>         if state == 'CONF_START_RECORD':</span><br><span style="color: hsl(0, 100%, 40%);">-            logger.debug("Detected CONF_START_RECORD")</span><br><span style="color: hsl(120, 100%, 40%);">+            logger.debug("State: {0} - Detected CONF_START_RECORD".format(</span><br><span style="color: hsl(120, 100%, 40%);">+                self.get_state_name()))</span><br><span>             self.test_case.expected_events['recordingstarted'] = True</span><br><span> </span><br><span>     def get_state_name(self):</span><br><span>@@ -126,7 +127,12 @@</span><br><span>         """ TestEvent handler.  Check for end of recording. """</span><br><span> </span><br><span>         state = event['state']</span><br><span style="color: hsl(0, 100%, 40%);">-        if state == 'CONF_STOP_RECORD':</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        if state == 'CONF_START_RECORD':</span><br><span style="color: hsl(120, 100%, 40%);">+            logger.debug("State: {0} - Detected CONF_START_RECORD".format(</span><br><span style="color: hsl(120, 100%, 40%);">+                self.get_state_name()))</span><br><span style="color: hsl(120, 100%, 40%);">+            self.test_case.expected_events['recordingstarted'] = True</span><br><span style="color: hsl(120, 100%, 40%);">+        elif state == 'CONF_STOP_RECORD':</span><br><span>             logger.debug("Detected CONF_STOP_RECORD")</span><br><span>             self.test_case.expected_events['recordingstopped'] = True</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10184">change 10184</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/10184"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: testsuite </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: If76b4613b79fdc60ebd4fe48a144de6b556bfb79 </div>
<div style="display:none"> Gerrit-Change-Number: 10184 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>