[asterisk-commits] testsuite: Update some pjsip basic calls authentication test... (testsuite[master])

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed May 27 13:45:28 CDT 2015


Mark Michelson has submitted this change and it was merged.

Change subject: testsuite: Update some pjsip basic_calls authentication tests for consistency.
......................................................................


testsuite: Update some pjsip basic_calls authentication tests for consistency.

* Run the SIPp test scenarios in series.  Log files make more sense that
way.

* Made port numbers unique to the SIPp test scenario so they can be easily
found in the log.

* Added missing test dependencies.

* Made the pjsip.conf files consistent.

Change-Id: I8b6d452b64b1a809674843718f669dccee20ddbc
---
M tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_host/configs/ast1/pjsip.conf
M tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_host/test-config.yaml
M tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user/configs/ast1/pjsip.conf
M tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user/test-config.yaml
M tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_host/test-config.yaml
M tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user/configs/ast1/pjsip.conf
M tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user/test-config.yaml
7 files changed, 147 insertions(+), 82 deletions(-)

Approvals:
  Mark Michelson: Looks good to me, approved; Verified
  Joshua Colp: Looks good to me, but someone else must approve



diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_host/configs/ast1/pjsip.conf b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_host/configs/ast1/pjsip.conf
index a9ecc99..4ae4806 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_host/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_host/configs/ast1/pjsip.conf
@@ -1,10 +1,10 @@
 [local-transport-template](!)
 type=transport
-bind=127.0.0.1:5060
+bind=127.0.0.1
 
 [local-transport6-template](!)
 type=transport
-bind=[::1]:5060
+bind=[::1]
 
 [local-transport-udp](local-transport-template)
 protocol=udp
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_host/test-config.yaml b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_host/test-config.yaml
index 9201eab..edbe5ca 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_host/test-config.yaml
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_host/test-config.yaml
@@ -1,7 +1,8 @@
 testinfo:
-    summary:     'Tests incoming calls without authentication'
+    summary:     'Tests incoming calls with authentication'
     description: |
-        'Run a SIPp scenario that sends various calls to res_pjsip, which should not be authenticated'
+        'Run a SIPp scenario that sends various calls to res_pjsip,
+        which should be authenticated'
 
 test-modules:
     test-object:
@@ -18,61 +19,63 @@
                 - { 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'alice-ipv4-udp'} }
         -
             scenarios:
-                - { 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5061', '-d': '5000', '-s': 'alice-ipv4-udp'} }
+                - { 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5062', '-d': '5000', '-s': 'alice-ipv4-udp'} }
         -
             scenarios:
-                - { 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'alice-ipv4-udp'} }
+                - { 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5063', '-s': 'alice-ipv4-udp'} }
         -
             scenarios:
-                - { 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5061', '-d': '5000', '-s': 'alice-ipv4-udp'} }
+                - { 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5064', '-d': '5000', '-s': 'alice-ipv4-udp'} }
 
         # IPv4 & TCP
         -
             scenarios:
-                 - { 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5061', '-t': 't1', '-s': 'alice-ipv4-tcp'} }
+                - { 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5065', '-t': 't1', '-s': 'alice-ipv4-tcp'} }
         -
             scenarios:
-                 - { 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5062', '-t': 't1', '-d': '5000', '-s': 'alice-ipv4-tcp'} }
+                - { 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5066', '-t': 't1', '-d': '5000', '-s': 'alice-ipv4-tcp'} }
         -
             scenarios:
-                 - { 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5066', '-t': 't1', '-s': 'alice-ipv4-tcp'} }
+                - { 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5067', '-t': 't1', '-s': 'alice-ipv4-tcp'} }
         -
             scenarios:
-                 - { 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5067', '-t': 't1', '-d': '5000', '-s': 'alice-ipv4-tcp'} }
+                - { 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5068', '-t': 't1', '-d': '5000', '-s': 'alice-ipv4-tcp'} }
 
         # IPv6 & UDP
         -
             scenarios:
-                 - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '[::1]', '-p': '5061', '-s': 'alice-ipv6-udp'} }
+                - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '[::1]', '-p': '5071', '-s': 'alice-ipv6-udp'} }
         -
             scenarios:
-                 - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '[::1]', '-p': '5062', '-d': '5000', '-s': 'alice-ipv6-udp'} }
+                - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '[::1]', '-p': '5072', '-d': '5000', '-s': 'alice-ipv6-udp'} }
         -
             scenarios:
-                 - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5066', '-s': 'alice-ipv6-udp'} }
+                - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5073', '-s': 'alice-ipv6-udp'} }
         -
             scenarios:
-                 - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5067', '-d': '5000', '-s': 'alice-ipv6-udp'} }
+                - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5074', '-d': '5000', '-s': 'alice-ipv6-udp'} }
 
         # IPv6 & TCP
         -
             scenarios:
-                 - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '[::1]', '-p': '5061', '-t': 't1', '-s': 'alice-ipv6-tcp'} }
+                - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '[::1]', '-p': '5075', '-t': 't1', '-s': 'alice-ipv6-tcp'} }
         -
             scenarios:
-                 - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '[::1]', '-p': '5062', '-t': 't1', '-d': '5000', '-s': 'alice-ipv6-tcp'} }
+                - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '[::1]', '-p': '5076', '-t': 't1', '-d': '5000', '-s': 'alice-ipv6-tcp'} }
         -
             scenarios:
-                 - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5066', '-t': 't1', '-s': 'alice-ipv6-tcp'} }
+                - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5077', '-t': 't1', '-s': 'alice-ipv6-tcp'} }
         -
             scenarios:
-                 - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5067', '-t': 't1', '-d': '5000', '-s': 'alice-ipv6-tcp'} }
+                - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5078', '-t': 't1', '-d': '5000', '-s': 'alice-ipv6-tcp'} }
 
 properties:
     minversion: '12.0.0'
     dependencies:
         - sipp :
             version : 'v3.0'
+        - asterisk : 'app_echo'
+        - asterisk : 'app_playback'
         - asterisk : 'res_pjsip'
     tags:
         - pjsip
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user/configs/ast1/pjsip.conf b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user/configs/ast1/pjsip.conf
index 37c6177..802cf5c 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user/configs/ast1/pjsip.conf
@@ -32,19 +32,15 @@
 rtp_ipv6=yes
 
 [alice-ipv4-udp](endpoint-template-ipv4)
-transport=local-transport-udp
 auth=alice-auth
 
 [alice-ipv4-tcp](endpoint-template-ipv4)
-transport=local-transport-tcp
 auth=alice-auth
 
 [alice-ipv6-udp](endpoint-template-ipv6)
-transport=local-transport-udp6
 auth=alice-auth
 
 [alice-ipv6-tcp](endpoint-template-ipv6)
-transport=local-transport-tcp6
 auth=alice-auth
 
 [auth-template](!)
@@ -54,5 +50,4 @@
 username=alice
 auth_type=md5
 md5_cred=c9b9e23e2160fd69b19f99116da19711
-; Place alice-specific auth options here
 
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user/test-config.yaml b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user/test-config.yaml
index a7dcda4..edbe5ca 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user/test-config.yaml
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/md5/ident_by_user/test-config.yaml
@@ -1,7 +1,8 @@
 testinfo:
-    summary:     'Tests incoming calls without authentication'
+    summary:     'Tests incoming calls with authentication'
     description: |
-        'Run a SIPp scenario that sends various calls to res_pjsip, which should not be authenticated'
+        'Run a SIPp scenario that sends various calls to res_pjsip,
+        which should be authenticated'
 
 test-modules:
     test-object:
@@ -9,39 +10,72 @@
         typename: 'sipp.SIPpTestCase'
 
 test-object-config:
+    reactor-timeout: 80
     fail-on-any: False
     test-iterations:
+        # IPv4 & UDP
         -
             scenarios:
-                # IPv4 & UDP
                 - { 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'alice-ipv4-udp'} }
+        -
+            scenarios:
                 - { 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5062', '-d': '5000', '-s': 'alice-ipv4-udp'} }
-                - { 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5066', '-s': 'alice-ipv4-udp'} }
-                - { 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5067', '-d': '5000', '-s': 'alice-ipv4-udp'} }
+        -
+            scenarios:
+                - { 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5063', '-s': 'alice-ipv4-udp'} }
+        -
+            scenarios:
+                - { 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5064', '-d': '5000', '-s': 'alice-ipv4-udp'} }
 
-                # IPv4 & TCP
-                - { 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5061', '-t': 't1', '-s': 'alice-ipv4-tcp'} }
-                - { 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5062', '-t': 't1', '-d': '5000', '-s': 'alice-ipv4-tcp'} }
-                - { 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5066', '-t': 't1', '-s': 'alice-ipv4-tcp'} }
-                - { 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5067', '-t': 't1', '-d': '5000', '-s': 'alice-ipv4-tcp'} }
+        # IPv4 & TCP
+        -
+            scenarios:
+                - { 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5065', '-t': 't1', '-s': 'alice-ipv4-tcp'} }
+        -
+            scenarios:
+                - { 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5066', '-t': 't1', '-d': '5000', '-s': 'alice-ipv4-tcp'} }
+        -
+            scenarios:
+                - { 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5067', '-t': 't1', '-s': 'alice-ipv4-tcp'} }
+        -
+            scenarios:
+                - { 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5068', '-t': 't1', '-d': '5000', '-s': 'alice-ipv4-tcp'} }
 
-                # IPv6 & UDP
-                - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '[::1]', '-p': '5061', '-s': 'alice-ipv6-udp'} }
-                - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '[::1]', '-p': '5062', '-d': '5000', '-s': 'alice-ipv6-udp'} }
-                - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5066', '-s': 'alice-ipv6-udp'} }
-                - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5067', '-d': '5000', '-s': 'alice-ipv6-udp'} }
+        # IPv6 & UDP
+        -
+            scenarios:
+                - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '[::1]', '-p': '5071', '-s': 'alice-ipv6-udp'} }
+        -
+            scenarios:
+                - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '[::1]', '-p': '5072', '-d': '5000', '-s': 'alice-ipv6-udp'} }
+        -
+            scenarios:
+                - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5073', '-s': 'alice-ipv6-udp'} }
+        -
+            scenarios:
+                - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5074', '-d': '5000', '-s': 'alice-ipv6-udp'} }
 
-                # IPv6 & TCP
-                - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '[::1]', '-p': '5061', '-t': 't1', '-s': 'alice-ipv6-tcp'} }
-                - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '[::1]', '-p': '5062', '-t': 't1', '-d': '5000', '-s': 'alice-ipv6-tcp'} }
-                - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5066', '-t': 't1', '-s': 'alice-ipv6-tcp'} }
-                - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5067', '-t': 't1', '-d': '5000', '-s': 'alice-ipv6-tcp'} }
+        # IPv6 & TCP
+        -
+            scenarios:
+                - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '[::1]', '-p': '5075', '-t': 't1', '-s': 'alice-ipv6-tcp'} }
+        -
+            scenarios:
+                - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '[::1]', '-p': '5076', '-t': 't1', '-d': '5000', '-s': 'alice-ipv6-tcp'} }
+        -
+            scenarios:
+                - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5077', '-t': 't1', '-s': 'alice-ipv6-tcp'} }
+        -
+            scenarios:
+                - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5078', '-t': 't1', '-d': '5000', '-s': 'alice-ipv6-tcp'} }
 
 properties:
     minversion: '12.0.0'
     dependencies:
         - sipp :
             version : 'v3.0'
+        - asterisk : 'app_echo'
+        - asterisk : 'app_playback'
         - asterisk : 'res_pjsip'
     tags:
         - pjsip
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_host/test-config.yaml b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_host/test-config.yaml
index a6191fe..edbe5ca 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_host/test-config.yaml
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_host/test-config.yaml
@@ -1,7 +1,8 @@
 testinfo:
-    summary:     'Tests incoming calls without authentication'
+    summary:     'Tests incoming calls with authentication'
     description: |
-        'Run a SIPp scenario that sends various calls to res_pjsip, which should not be authenticated'
+        'Run a SIPp scenario that sends various calls to res_pjsip,
+        which should be authenticated'
 
 test-modules:
     test-object:
@@ -29,50 +30,52 @@
         # IPv4 & TCP
         -
             scenarios:
-                 - { 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5065', '-t': 't1', '-s': 'alice-ipv4-tcp'} }
+                - { 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5065', '-t': 't1', '-s': 'alice-ipv4-tcp'} }
         -
             scenarios:
-                 - { 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5066', '-t': 't1', '-d': '5000', '-s': 'alice-ipv4-tcp'} }
+                - { 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5066', '-t': 't1', '-d': '5000', '-s': 'alice-ipv4-tcp'} }
         -
             scenarios:
-                 - { 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5067', '-t': 't1', '-s': 'alice-ipv4-tcp'} }
+                - { 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5067', '-t': 't1', '-s': 'alice-ipv4-tcp'} }
         -
             scenarios:
-                 - { 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5068', '-t': 't1', '-d': '5000', '-s': 'alice-ipv4-tcp'} }
+                - { 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5068', '-t': 't1', '-d': '5000', '-s': 'alice-ipv4-tcp'} }
 
         # IPv6 & UDP
         -
             scenarios:
-                 - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '[::1]', '-p': '5069', '-s': 'alice-ipv6-udp'} }
+                - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '[::1]', '-p': '5071', '-s': 'alice-ipv6-udp'} }
         -
             scenarios:
-                 - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '[::1]', '-p': '5070', '-d': '5000', '-s': 'alice-ipv6-udp'} }
+                - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '[::1]', '-p': '5072', '-d': '5000', '-s': 'alice-ipv6-udp'} }
         -
             scenarios:
-                 - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5071', '-s': 'alice-ipv6-udp'} }
+                - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5073', '-s': 'alice-ipv6-udp'} }
         -
             scenarios:
-                 - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5072', '-d': '5000', '-s': 'alice-ipv6-udp'} }
+                - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5074', '-d': '5000', '-s': 'alice-ipv6-udp'} }
 
         # IPv6 & TCP
         -
             scenarios:
-                 - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '[::1]', '-p': '5073', '-t': 't1', '-s': 'alice-ipv6-tcp'} }
+                - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '[::1]', '-p': '5075', '-t': 't1', '-s': 'alice-ipv6-tcp'} }
         -
             scenarios:
-                 - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '[::1]', '-p': '5074', '-t': 't1', '-d': '5000', '-s': 'alice-ipv6-tcp'} }
+                - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '[::1]', '-p': '5076', '-t': 't1', '-d': '5000', '-s': 'alice-ipv6-tcp'} }
         -
             scenarios:
-                 - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5075', '-t': 't1', '-s': 'alice-ipv6-tcp'} }
+                - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5077', '-t': 't1', '-s': 'alice-ipv6-tcp'} }
         -
             scenarios:
-                 - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5076', '-t': 't1', '-d': '5000', '-s': 'alice-ipv6-tcp'} }
+                - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5078', '-t': 't1', '-d': '5000', '-s': 'alice-ipv6-tcp'} }
 
 properties:
     minversion: '12.0.0'
     dependencies:
         - sipp :
             version : 'v3.0'
+        - asterisk : 'app_echo'
+        - asterisk : 'app_playback'
         - asterisk : 'res_pjsip'
     tags:
         - pjsip
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user/configs/ast1/pjsip.conf b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user/configs/ast1/pjsip.conf
index 0e530b3..9732121 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user/configs/ast1/pjsip.conf
@@ -32,19 +32,15 @@
 rtp_ipv6=yes
 
 [alice-ipv4-udp](endpoint-template-ipv4)
-transport=local-transport-udp
 auth=alice-auth
 
 [alice-ipv4-tcp](endpoint-template-ipv4)
-transport=local-transport-tcp
 auth=alice-auth
 
 [alice-ipv6-udp](endpoint-template-ipv6)
-transport=local-transport-udp6
 auth=alice-auth
 
 [alice-ipv6-tcp](endpoint-template-ipv6)
-transport=local-transport-tcp6
 auth=alice-auth
 
 [auth-template](!)
diff --git a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user/test-config.yaml b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user/test-config.yaml
index a7dcda4..edbe5ca 100644
--- a/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user/test-config.yaml
+++ b/tests/channels/pjsip/basic_calls/incoming/nominal/authed/userpass/ident_by_user/test-config.yaml
@@ -1,7 +1,8 @@
 testinfo:
-    summary:     'Tests incoming calls without authentication'
+    summary:     'Tests incoming calls with authentication'
     description: |
-        'Run a SIPp scenario that sends various calls to res_pjsip, which should not be authenticated'
+        'Run a SIPp scenario that sends various calls to res_pjsip,
+        which should be authenticated'
 
 test-modules:
     test-object:
@@ -9,39 +10,72 @@
         typename: 'sipp.SIPpTestCase'
 
 test-object-config:
+    reactor-timeout: 80
     fail-on-any: False
     test-iterations:
+        # IPv4 & UDP
         -
             scenarios:
-                # IPv4 & UDP
                 - { 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'alice-ipv4-udp'} }
+        -
+            scenarios:
                 - { 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5062', '-d': '5000', '-s': 'alice-ipv4-udp'} }
-                - { 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5066', '-s': 'alice-ipv4-udp'} }
-                - { 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5067', '-d': '5000', '-s': 'alice-ipv4-udp'} }
+        -
+            scenarios:
+                - { 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5063', '-s': 'alice-ipv4-udp'} }
+        -
+            scenarios:
+                - { 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5064', '-d': '5000', '-s': 'alice-ipv4-udp'} }
 
-                # IPv4 & TCP
-                - { 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5061', '-t': 't1', '-s': 'alice-ipv4-tcp'} }
-                - { 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5062', '-t': 't1', '-d': '5000', '-s': 'alice-ipv4-tcp'} }
-                - { 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5066', '-t': 't1', '-s': 'alice-ipv4-tcp'} }
-                - { 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5067', '-t': 't1', '-d': '5000', '-s': 'alice-ipv4-tcp'} }
+        # IPv4 & TCP
+        -
+            scenarios:
+                - { 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5065', '-t': 't1', '-s': 'alice-ipv4-tcp'} }
+        -
+            scenarios:
+                - { 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '127.0.0.1', '-p': '5066', '-t': 't1', '-d': '5000', '-s': 'alice-ipv4-tcp'} }
+        -
+            scenarios:
+                - { 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5067', '-t': 't1', '-s': 'alice-ipv4-tcp'} }
+        -
+            scenarios:
+                - { 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '127.0.0.1', '-p': '5068', '-t': 't1', '-d': '5000', '-s': 'alice-ipv4-tcp'} }
 
-                # IPv6 & UDP
-                - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '[::1]', '-p': '5061', '-s': 'alice-ipv6-udp'} }
-                - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '[::1]', '-p': '5062', '-d': '5000', '-s': 'alice-ipv6-udp'} }
-                - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5066', '-s': 'alice-ipv6-udp'} }
-                - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5067', '-d': '5000', '-s': 'alice-ipv6-udp'} }
+        # IPv6 & UDP
+        -
+            scenarios:
+                - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '[::1]', '-p': '5071', '-s': 'alice-ipv6-udp'} }
+        -
+            scenarios:
+                - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '[::1]', '-p': '5072', '-d': '5000', '-s': 'alice-ipv6-udp'} }
+        -
+            scenarios:
+                - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5073', '-s': 'alice-ipv6-udp'} }
+        -
+            scenarios:
+                - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5074', '-d': '5000', '-s': 'alice-ipv6-udp'} }
 
-                # IPv6 & TCP
-                - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '[::1]', '-p': '5061', '-t': 't1', '-s': 'alice-ipv6-tcp'} }
-                - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '[::1]', '-p': '5062', '-t': 't1', '-d': '5000', '-s': 'alice-ipv6-tcp'} }
-                - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5066', '-t': 't1', '-s': 'alice-ipv6-tcp'} }
-                - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5067', '-t': 't1', '-d': '5000', '-s': 'alice-ipv6-tcp'} }
+        # IPv6 & TCP
+        -
+            scenarios:
+                - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_initial_sdp.xml', '-i': '[::1]', '-p': '5075', '-t': 't1', '-s': 'alice-ipv6-tcp'} }
+        -
+            scenarios:
+                - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_initial_sdp.xml', '-i': '[::1]', '-p': '5076', '-t': 't1', '-d': '5000', '-s': 'alice-ipv6-tcp'} }
+        -
+            scenarios:
+                - { 'target': '[::1]', 'key-args': {'scenario': 'playback_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5077', '-t': 't1', '-s': 'alice-ipv6-tcp'} }
+        -
+            scenarios:
+                - { 'target': '[::1]', 'key-args': {'scenario': 'echo_with_deferred_sdp.xml', '-i': '[::1]', '-p': '5078', '-t': 't1', '-d': '5000', '-s': 'alice-ipv6-tcp'} }
 
 properties:
     minversion: '12.0.0'
     dependencies:
         - sipp :
             version : 'v3.0'
+        - asterisk : 'app_echo'
+        - asterisk : 'app_playback'
         - asterisk : 'res_pjsip'
     tags:
         - pjsip

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8b6d452b64b1a809674843718f669dccee20ddbc
Gerrit-PatchSet: 1
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Richard Mudgett <rmudgett at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Mark Michelson <mmichelson at digium.com>



More information about the asterisk-commits mailing list