[Asterisk-code-review] apps/dial tests: Wait for SIPp scenarios to start before ori... (testsuite[master])

Joshua Colp asteriskteam at digium.com
Thu Oct 15 14:49:54 CDT 2015


Joshua Colp has submitted this change and it was merged.

Change subject: apps/dial tests: Wait for SIPp scenarios to start before originating.
......................................................................


apps/dial tests: Wait for SIPp scenarios to start before originating.

Change-Id: Ib2d030de690662fa7590573c05cc72aeb0977f2b
---
M tests/apps/dial/dial_answer/test-config.yaml
M tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml
M tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml
M tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml
M tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml
M tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml
M tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml
M tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml
M tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml
M tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml
M tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml
11 files changed, 44 insertions(+), 22 deletions(-)

Approvals:
  Kevin Harwell: Looks good to me, but someone else must approve
  Anonymous Coward #1000019: Verified
  Matt Jordan: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved



diff --git a/tests/apps/dial/dial_answer/test-config.yaml b/tests/apps/dial/dial_answer/test-config.yaml
index d365b60..de6468f 100644
--- a/tests/apps/dial/dial_answer/test-config.yaml
+++ b/tests/apps/dial/dial_answer/test-config.yaml
@@ -199,10 +199,12 @@
         count: '1'
 
 originator-config:
+    trigger: 'scenario_start'
+    scenario-trigger-after: '1'
+    ignore-originate-failure: 'yes'
+    id: '0'
     channel: 'Local/s at default'
     application: 'Echo'
-    ignore-originate-failure: 'yes'
-    trigger: 'ami_connect'
     async: True
 
 sipp-config:
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml
index d66b271..c2bb5c7 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_busy/test-config.yaml
@@ -195,10 +195,12 @@
         count: '1'
 
 originator-config:
+    trigger: 'scenario_start'
+    scenario-trigger-after: '2'
+    ignore-originate-failure: 'yes'
+    id: '0'
     channel: 'Local/s at default'
     application: 'Echo'
-    ignore-originate-failure: 'yes'
-    trigger: 'ami_connect'
     async: True
 
 sipp-config:
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml
index 09d5221..12c5e5e 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_cancel/test-config.yaml
@@ -210,13 +210,15 @@
         count: '1'
 
 originator-config:
+    trigger: 'scenario_start'
+    scenario-trigger-after: '2'
+    ignore-originate-failure: 'yes'
+    id: '0'
     channel: 'Local/s at default'
     context: 'default'
     exten: 'echo_wait'
     priority: '1'
     async: 'True'
-    ignore-originate-failure: 'yes'
-    trigger: 'ami_connect'
 
 sipp-config:
     fail-on-any: True
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml
index 764f66f..1110c55 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_congestion/test-config.yaml
@@ -195,10 +195,12 @@
         count: '1'
 
 originator-config:
+    trigger: 'scenario_start'
+    scenario-trigger-after: '2'
+    ignore-originate-failure: 'yes'
+    id: '0'
     channel: 'Local/s at default'
     application: 'Echo'
-    ignore-originate-failure: 'yes'
-    trigger: 'ami_connect'
     async: True
 
 sipp-config:
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml
index 0db527e..4a69635 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_no_answer/test-config.yaml
@@ -195,10 +195,12 @@
         count: '1'
 
 originator-config:
+    trigger: 'scenario_start'
+    scenario-trigger-after: '2'
+    ignore-originate-failure: 'yes'
+    id: '0'
     channel: 'Local/s at default'
     application: 'Echo'
-    ignore-originate-failure: 'yes'
-    trigger: 'ami_connect'
     async: True
 
 sipp-config:
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml
index 56741b1..dd2344c 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_all_unavail/test-config.yaml
@@ -195,10 +195,12 @@
         count: '1'
 
 originator-config:
+    trigger: 'scenario_start'
+    scenario-trigger-after: '2'
+    ignore-originate-failure: 'yes'
+    id: '0'
     channel: 'Local/s at default'
     application: 'Echo'
-    ignore-originate-failure: 'yes'
-    trigger: 'ami_connect'
     async: True
 
 sipp-config:
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml
index ab257f2..38d5fc2 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_answer_cancel/test-config.yaml
@@ -322,12 +322,14 @@
         count: '1'
 
 originator-config:
+    trigger: 'scenario_start'
+    scenario-trigger-after: '2'
+    ignore-originate-failure: 'yes'
+    id: '0'
     channel: 'Local/s at default'
     context: 'default'
     exten: 'echo'
     priority: 1
-    ignore-originate-failure: 'yes'
-    trigger: 'ami_connect'
     async: True
 
 sipp-config:
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml
index f39316a..f1c80ae 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_busy/test-config.yaml
@@ -195,12 +195,14 @@
         count: '1'
 
 originator-config:
+    trigger: 'scenario_start'
+    scenario-trigger-after: '2'
+    ignore-originate-failure: 'yes'
+    id: '0'
     channel: 'Local/s at default'
     context: 'default'
     exten: 'echo'
     priority: 1
-    ignore-originate-failure: 'yes'
-    trigger: 'ami_connect'
     async: True
 
 sipp-config:
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml
index bfe4003..fb5d818 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_congestion/test-config.yaml
@@ -195,12 +195,14 @@
         count: '1'
 
 originator-config:
+    trigger: 'scenario_start'
+    scenario-trigger-after: '2'
+    ignore-originate-failure: 'yes'
+    id: '0'
     channel: 'Local/s at default'
     context: 'default'
     exten: 'echo'
     priority: 1
-    ignore-originate-failure: 'yes'
-    trigger: 'ami_connect'
     async: True
 
 sipp-config:
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml
index dd1bcc3..7d0a1cf 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_no_answer/test-config.yaml
@@ -195,12 +195,14 @@
         count: '1'
 
 originator-config:
+    trigger: 'scenario_start'
+    scenario-trigger-after: '2'
+    ignore-originate-failure: 'yes'
+    id: '0'
     channel: 'Local/s at default'
     context: 'default'
     exten: 'echo'
     priority: 1
-    ignore-originate-failure: 'yes'
-    trigger: 'ami_connect'
     async: True
 
 sipp-config:
diff --git a/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml b/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml
index e9abccc..fe28ff8 100644
--- a/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml
+++ b/tests/apps/dial/dial_parallel/dial_parallel_single_unavail/test-config.yaml
@@ -195,12 +195,14 @@
         count: '1'
 
 originator-config:
+    trigger: 'scenario_start'
+    scenario-trigger-after: '2'
+    ignore-originate-failure: 'yes'
+    id: '0'
     channel: 'Local/s at default'
     context: 'default'
     exten: 'echo'
     priority: 1
-    ignore-originate-failure: 'yes'
-    trigger: 'ami_connect'
     async: True
 
 sipp-config:

-- 
To view, visit https://gerrit.asterisk.org/1444
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2d030de690662fa7590573c05cc72aeb0977f2b
Gerrit-PatchSet: 1
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Richard Mudgett <rmudgett 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-code-review mailing list