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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">endpoints/statsd: Update test to use new condition based matching<br><br>The statsd tests were written in a way that did not allow for flexible message<br>matching. A previous patch added condition based message handling and matching<br>routines that allow greater flexibility in matching messages.<br><br>This patch updates the endpoints/statsd test to take advantage of that. It also<br>removes an unneeded dependency.<br><br>Change-Id: I4c3b5e1efe063b047d41f8c7f4c4674324af2650<br>---<br>M tests/endpoints/statsd/test-config.yaml<br>1 file changed, 21 insertions(+), 36 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/tests/endpoints/statsd/test-config.yaml b/tests/endpoints/statsd/test-config.yaml<br>index 560eede..752c969 100644<br>--- a/tests/endpoints/statsd/test-config.yaml<br>+++ b/tests/endpoints/statsd/test-config.yaml<br>@@ -12,8 +12,8 @@<br>         typename: 'test_case.TestCaseModule'<br>     modules:<br>         -<br>-            typename: 'mockd.MockDServer'<br>-            config-section: 'statsd-config'<br>+            config-section: event-action-config<br>+            typename: 'pluggable_modules.EventActionModule'<br>         -<br>             typename: 'pluggable_modules.Originator'<br>             config-section: 'originator-config'<br>@@ -29,38 +29,25 @@<br> hangup-monitor:<br>     ids: '0'<br> <br>-# Note: due to a bug in getting duplicate endpoint events over<br>-# Stasis, we'll see two statsd messages for the channel counts<br>-# for an Endpoint. When that is fixed, the duplicate messages<br>-# below should be removed.<br>-statsd-config:<br>-    prefix: 'endpoints'<br>-    regex: True<br>-    packets:<br>-        -<br>-            'endpoints\.count:\+1\|g'<br>-        -<br>-            'endpoints\.state\.online:\+1\|g'<br>-        -<br>-            'endpoints\.count:\+1\|g'<br>-        -<br>-            'endpoints\.state\.unknown:\+1\|g'<br>-        -<br>-            'endpoints\.PJSIP\.test\.channels:1\|g'<br>-        -<br>-            'endpoints\.PJSIP\.test\.channels:2\|g'<br>-        -<br>-            'endpoints\.PJSIP\.test\.channels:1\|g'<br>-        -<br>-            'endpoints\.PJSIP\.test\.channels:0\|g'<br>-        -<br>-            'endpoints\.count:\-1\|g'<br>-        -<br>-            'endpoints\.state\.online:\-1\|g'<br>-        -<br>-            'endpoints\.count:\-1\|g'<br>-        -<br>-            'endpoints\.state\.unknown:\-1\|g'<br>+event-action-config:<br>+    event:<br>+        type: 'matcher_listener.Udp'<br>+        conditions:<br>+            -<br>+                'endpoints\.count:\+1\|g'<br>+            -<br>+                'endpoints\.state\.online:\+1\|g'<br>+            -<br>+                match: 'endpoints\.PJSIP\.test\.channels:1\|g'<br>+                count: 2<br>+            -<br>+                'endpoints\.PJSIP\.test\.channels:2\|g'<br>+            -<br>+                'endpoints\.PJSIP\.test\.channels:0\|g'<br>+            -<br>+                'endpoints\.state\.online:\-1\|g'<br>+            -<br>+                'endpoints\.count:\-1\|g'<br> <br> originator-config:<br>     channel: 'PJSIP/test'<br>@@ -77,7 +64,5 @@<br>         - python: 'autobahn.websocket'<br>         - python: 'starpy'<br>         - python: 'twisted'<br>-        - app:    'statsd'<br>     tags:<br>         - statsd<br>-        - apps<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9279">change 9279</a>. To unsubscribe, 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/9279"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: testsuite </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I4c3b5e1efe063b047d41f8c7f4c4674324af2650 </div>
<div style="display:none"> Gerrit-Change-Number: 9279 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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>