[Asterisk-code-review] apps/statsd: Update tests to use new condition based matching (testsuite[master])
Jenkins2
asteriskteam at digium.com
Thu Jun 28 07:25:35 CDT 2018
Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/9284 )
Change subject: apps/statsd: Update tests to use new condition based matching
......................................................................
apps/statsd: Update tests to use new condition based matching
The apps/statsd tests were written in a way that did not allow for flexible
message matching. A previous patch added condition based message handling and
matching routines that allow greater flexibility in matching messages.
This patch updates the apps/statsd tests to take advantage of that.
Change-Id: I36de44a6dd508ba11b8f70a146592b0cbe814638
---
M tests/apps/statsd/nominal/test-config.yaml
M tests/apps/statsd/off-nominal/empty_params/test-config.yaml
M tests/apps/statsd/off-nominal/invalid_metric/test-config.yaml
M tests/apps/statsd/off-nominal/invalid_sample_rate/test-config.yaml
M tests/apps/statsd/off-nominal/invalid_value/test-config.yaml
M tests/apps/statsd/off-nominal/invalid_variable/test-config.yaml
M tests/apps/statsd/off-nominal/no_metric/test-config.yaml
M tests/apps/statsd/off-nominal/no_value/test-config.yaml
M tests/apps/statsd/off-nominal/no_variable/test-config.yaml
9 files changed, 95 insertions(+), 61 deletions(-)
Approvals:
Joshua Colp: Looks good to me, but someone else must approve
Corey Farrell: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Jenkins2: Approved for Submit
diff --git a/tests/apps/statsd/nominal/test-config.yaml b/tests/apps/statsd/nominal/test-config.yaml
index 81d7b04..b661bc7 100644
--- a/tests/apps/statsd/nominal/test-config.yaml
+++ b/tests/apps/statsd/nominal/test-config.yaml
@@ -12,8 +12,8 @@
typename: 'test_case.TestCaseModule'
modules:
-
- typename: 'mockd.MockDServer'
- config-section: 'statsd-config'
+ config-section: event-action-config
+ typename: 'pluggable_modules.EventActionModule'
-
typename: 'pluggable_modules.Originator'
config-section: 'originator-config'
@@ -23,17 +23,18 @@
connect-ami: True
reactor-timeout: 15
-statsd-config:
- prefix: nominal
- packets:
- -
- 'nominal.foo:1|g'
- -
- 'nominal.bar:2|s'
- -
- 'nominal.baz:3|ms'
- -
- 'nominal.last:4|c'
+event-action-config:
+ event:
+ type: 'matcher_listener.Udp'
+ conditions:
+ -
+ 'nominal.foo:1|g'
+ -
+ 'nominal.bar:2|s'
+ -
+ 'nominal.baz:3|ms'
+ -
+ 'nominal.last:4|c'
originator-config:
channel: 'Local/start at default'
@@ -49,6 +50,7 @@
- python: 'starpy'
- python: 'twisted'
- asterisk: 'app_statsd'
+ - asterisk: 'res_statsd'
tags:
- statsd
- apps
diff --git a/tests/apps/statsd/off-nominal/empty_params/test-config.yaml b/tests/apps/statsd/off-nominal/empty_params/test-config.yaml
index 2934e56..279fb44 100644
--- a/tests/apps/statsd/off-nominal/empty_params/test-config.yaml
+++ b/tests/apps/statsd/off-nominal/empty_params/test-config.yaml
@@ -11,8 +11,8 @@
typename: 'test_case.TestCaseModule'
modules:
-
- typename: 'mockd.MockDServer'
- config-section: 'statsd-config'
+ config-section: event-action-config
+ typename: 'pluggable_modules.EventActionModule'
-
typename: 'pluggable_modules.Originator'
config-section: 'originator-config'
@@ -22,10 +22,13 @@
connect-ami: True
reactor-timeout: 15
-statsd-config:
- packets:
- -
- 'ReceiveNothing'
+event-action-config:
+ event:
+ type: 'matcher_listener.Udp'
+ conditions:
+ -
+ match: '.*'
+ count: 0
originator-config:
channel: 'Local/start at default'
@@ -41,6 +44,7 @@
- python: 'starpy'
- python: 'twisted'
- asterisk: 'app_statsd'
+ - asterisk: 'res_statsd'
tags:
- statsd
- apps
diff --git a/tests/apps/statsd/off-nominal/invalid_metric/test-config.yaml b/tests/apps/statsd/off-nominal/invalid_metric/test-config.yaml
index 822fd78..4fb0f13 100644
--- a/tests/apps/statsd/off-nominal/invalid_metric/test-config.yaml
+++ b/tests/apps/statsd/off-nominal/invalid_metric/test-config.yaml
@@ -11,8 +11,8 @@
typename: 'test_case.TestCaseModule'
modules:
-
- typename: 'mockd.MockDServer'
- config-section: 'statsd-config'
+ config-section: event-action-config
+ typename: 'pluggable_modules.EventActionModule'
-
typename: 'pluggable_modules.Originator'
config-section: 'originator-config'
@@ -22,10 +22,13 @@
connect-ami: True
reactor-timeout: 15
-statsd-config:
- packets:
- -
- 'ReceiveNothing'
+event-action-config:
+ event:
+ type: 'matcher_listener.Udp'
+ conditions:
+ -
+ match: '.*'
+ count: 0
originator-config:
channel: 'Local/start at default'
@@ -41,6 +44,7 @@
- python: 'starpy'
- python: 'twisted'
- asterisk: 'app_statsd'
+ - asterisk: 'res_statsd'
tags:
- statsd
- apps
diff --git a/tests/apps/statsd/off-nominal/invalid_sample_rate/test-config.yaml b/tests/apps/statsd/off-nominal/invalid_sample_rate/test-config.yaml
index 1978a4c..83bcce1 100644
--- a/tests/apps/statsd/off-nominal/invalid_sample_rate/test-config.yaml
+++ b/tests/apps/statsd/off-nominal/invalid_sample_rate/test-config.yaml
@@ -11,8 +11,8 @@
typename: 'test_case.TestCaseModule'
modules:
-
- typename: 'mockd.MockDServer'
- config-section: 'statsd-config'
+ config-section: event-action-config
+ typename: 'pluggable_modules.EventActionModule'
-
typename: 'pluggable_modules.Originator'
config-section: 'originator-config'
@@ -22,10 +22,13 @@
connect-ami: True
reactor-timeout: 15
-statsd-config:
- packets:
- -
- 'ReceiveNothing'
+event-action-config:
+ event:
+ type: 'matcher_listener.Udp'
+ conditions:
+ -
+ match: '.*'
+ count: 0
originator-config:
channel: 'Local/start at default'
@@ -41,6 +44,7 @@
- python: 'starpy'
- python: 'twisted'
- asterisk: 'app_statsd'
+ - asterisk: 'res_statsd'
tags:
- statsd
- apps
diff --git a/tests/apps/statsd/off-nominal/invalid_value/test-config.yaml b/tests/apps/statsd/off-nominal/invalid_value/test-config.yaml
index 6124f37..dc2259c 100644
--- a/tests/apps/statsd/off-nominal/invalid_value/test-config.yaml
+++ b/tests/apps/statsd/off-nominal/invalid_value/test-config.yaml
@@ -11,8 +11,8 @@
typename: 'test_case.TestCaseModule'
modules:
-
- typename: 'mockd.MockDServer'
- config-section: 'statsd-config'
+ config-section: event-action-config
+ typename: 'pluggable_modules.EventActionModule'
-
typename: 'pluggable_modules.Originator'
config-section: 'originator-config'
@@ -22,10 +22,13 @@
connect-ami: True
reactor-timeout: 15
-statsd-config:
- packets:
- -
- 'ReceiveNothing'
+event-action-config:
+ event:
+ type: 'matcher_listener.Udp'
+ conditions:
+ -
+ match: '.*'
+ count: 0
originator-config:
channel: 'Local/start at default'
@@ -41,6 +44,7 @@
- python: 'starpy'
- python: 'twisted'
- asterisk: 'app_statsd'
+ - asterisk: 'res_statsd'
tags:
- statsd
- apps
diff --git a/tests/apps/statsd/off-nominal/invalid_variable/test-config.yaml b/tests/apps/statsd/off-nominal/invalid_variable/test-config.yaml
index 16da613..0294eeb 100644
--- a/tests/apps/statsd/off-nominal/invalid_variable/test-config.yaml
+++ b/tests/apps/statsd/off-nominal/invalid_variable/test-config.yaml
@@ -11,8 +11,8 @@
typename: 'test_case.TestCaseModule'
modules:
-
- typename: 'mockd.MockDServer'
- config-section: 'statsd-config'
+ config-section: event-action-config
+ typename: 'pluggable_modules.EventActionModule'
-
typename: 'pluggable_modules.Originator'
config-section: 'originator-config'
@@ -22,10 +22,13 @@
connect-ami: True
reactor-timeout: 15
-statsd-config:
- packets:
- -
- 'ReceiveNothing'
+event-action-config:
+ event:
+ type: 'matcher_listener.Udp'
+ conditions:
+ -
+ match: '.*'
+ count: 0
originator-config:
channel: 'Local/start at default'
@@ -41,6 +44,7 @@
- python: 'starpy'
- python: 'twisted'
- asterisk: 'app_statsd'
+ - asterisk: 'res_statsd'
tags:
- statsd
- apps
diff --git a/tests/apps/statsd/off-nominal/no_metric/test-config.yaml b/tests/apps/statsd/off-nominal/no_metric/test-config.yaml
index 8b5692e..c687ccb 100644
--- a/tests/apps/statsd/off-nominal/no_metric/test-config.yaml
+++ b/tests/apps/statsd/off-nominal/no_metric/test-config.yaml
@@ -11,8 +11,8 @@
typename: 'test_case.TestCaseModule'
modules:
-
- typename: 'mockd.MockDServer'
- config-section: 'statsd-config'
+ config-section: event-action-config
+ typename: 'pluggable_modules.EventActionModule'
-
typename: 'pluggable_modules.Originator'
config-section: 'originator-config'
@@ -22,10 +22,13 @@
connect-ami: True
reactor-timeout: 15
-statsd-config:
- packets:
- -
- 'ReceiveNothing'
+event-action-config:
+ event:
+ type: 'matcher_listener.Udp'
+ conditions:
+ -
+ match: '.*'
+ count: 0
originator-config:
channel: 'Local/start at default'
@@ -41,6 +44,7 @@
- python: 'starpy'
- python: 'twisted'
- asterisk: 'app_statsd'
+ - asterisk: 'res_statsd'
tags:
- statsd
- apps
diff --git a/tests/apps/statsd/off-nominal/no_value/test-config.yaml b/tests/apps/statsd/off-nominal/no_value/test-config.yaml
index ad8f1e2..f2e6e54 100644
--- a/tests/apps/statsd/off-nominal/no_value/test-config.yaml
+++ b/tests/apps/statsd/off-nominal/no_value/test-config.yaml
@@ -11,8 +11,8 @@
typename: 'test_case.TestCaseModule'
modules:
-
- typename: 'mockd.MockDServer'
- config-section: 'statsd-config'
+ config-section: event-action-config
+ typename: 'pluggable_modules.EventActionModule'
-
typename: 'pluggable_modules.Originator'
config-section: 'originator-config'
@@ -22,10 +22,13 @@
connect-ami: True
reactor-timeout: 15
-statsd-config:
- packets:
- -
- 'ReceiveNothing'
+event-action-config:
+ event:
+ type: 'matcher_listener.Udp'
+ conditions:
+ -
+ match: '.*'
+ count: 0
originator-config:
channel: 'Local/start at default'
@@ -41,6 +44,7 @@
- python: 'starpy'
- python: 'twisted'
- asterisk: 'app_statsd'
+ - asterisk: 'res_statsd'
tags:
- statsd
- apps
diff --git a/tests/apps/statsd/off-nominal/no_variable/test-config.yaml b/tests/apps/statsd/off-nominal/no_variable/test-config.yaml
index 9b6053e..5eb8397 100644
--- a/tests/apps/statsd/off-nominal/no_variable/test-config.yaml
+++ b/tests/apps/statsd/off-nominal/no_variable/test-config.yaml
@@ -13,8 +13,8 @@
typename: 'test_case.TestCaseModule'
modules:
-
- typename: 'mockd.MockDServer'
- config-section: 'statsd-config'
+ config-section: event-action-config
+ typename: 'pluggable_modules.EventActionModule'
-
typename: 'pluggable_modules.Originator'
config-section: 'originator-config'
@@ -24,10 +24,13 @@
connect-ami: True
reactor-timeout: 15
-statsd-config:
- packets:
- -
- 'ReceiveNothing'
+event-action-config:
+ event:
+ type: 'matcher_listener.Udp'
+ conditions:
+ -
+ match: '.*'
+ count: 0
originator-config:
channel: 'Local/start at default'
@@ -43,6 +46,7 @@
- python: 'starpy'
- python: 'twisted'
- asterisk: 'app_statsd'
+ - asterisk: 'res_statsd'
tags:
- statsd
- apps
--
To view, visit https://gerrit.asterisk.org/9284
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I36de44a6dd508ba11b8f70a146592b0cbe814638
Gerrit-Change-Number: 9284
Gerrit-PatchSet: 3
Gerrit-Owner: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180628/51845e1c/attachment-0001.html>
More information about the asterisk-code-review
mailing list