[Asterisk-code-review] Revert "res pjsip: Test failover when server is not available" (testsuite[master])

Mark Michelson asteriskteam at digium.com
Mon Jul 6 11:52:19 CDT 2015


Mark Michelson has uploaded a new change for review.

  https://gerrit.asterisk.org/791

Change subject: Revert "res_pjsip: Test failover when server is not available"
......................................................................

Revert "res_pjsip: Test failover when server is not available"

Accidentally submitted this before Asterisk-side changes had been made

This reverts commit df873ddc9af71112e9808d3feb46c6bebd7e713f.

Change-Id: I20a467ad35caeb4f324ead14f3ae1069668dc22c
---
D tests/channels/pjsip/resolver/srv/failover/in_dialog/tests.yaml
D tests/channels/pjsip/resolver/srv/failover/in_dialog/timeout/configs/ast1/extensions.conf
D tests/channels/pjsip/resolver/srv/failover/in_dialog/timeout/configs/ast1/pjsip.conf
D tests/channels/pjsip/resolver/srv/failover/in_dialog/timeout/dns_zones/example.com
D tests/channels/pjsip/resolver/srv/failover/in_dialog/timeout/sipp/uas-ignore.xml
D tests/channels/pjsip/resolver/srv/failover/in_dialog/timeout/test-config.yaml
D tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/configs/ast1/extensions.conf
D tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/configs/ast1/pjsip.conf
D tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/configs/ast1/resolver_unbound.conf
D tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/dns_zones/example.com
D tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/sipp/uas-503.xml
D tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/sipp/uas-ignore.xml
D tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/test-config.yaml
D tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_udp/configs/ast1/extensions.conf
D tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_udp/configs/ast1/resolver_unbound.conf
D tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_udp/dns_zones/example.com
D tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_udp/sipp/uas-ignore.xml
D tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/configs/ast1/extensions.conf
D tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/configs/ast1/pjsip.conf
D tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/configs/ast1/resolver_unbound.conf
D tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/sipp/uas-503.xml
D tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/sipp/uas-ignore.xml
D tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/test-config.yaml
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/tests.yaml
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/timeout/configs/ast1/extensions.conf
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/timeout/configs/ast1/pjsip.conf
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/timeout/configs/ast1/resolver_unbound.conf
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/timeout/dns_zones/example.com
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/timeout/sipp/uas-ignore.xml
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/timeout/test-config.yaml
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/configs/ast1/extensions.conf
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/configs/ast1/pjsip.conf
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/configs/ast1/resolver_unbound.conf
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/dns_zones/example.com
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/sipp/uas-503.xml
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/sipp/uas-ignore.xml
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/test-config.yaml
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/configs/ast1/extensions.conf
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/configs/ast1/pjsip.conf
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/configs/ast1/resolver_unbound.conf
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/dns_zones/example.com
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/sipp/uas-503.xml
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/sipp/uas-ignore.xml
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/test-config.yaml
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/configs/ast1/extensions.conf
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/configs/ast1/pjsip.conf
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/configs/ast1/resolver_unbound.conf
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/dns_zones/example.com
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/sipp/uas-503.xml
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/sipp/uas-ignore.xml
D tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/test-config.yaml
D tests/channels/pjsip/resolver/srv/failover/tests.yaml
A tests/channels/pjsip/resolver/srv/failover_udp/configs/ast1/extensions.conf
R tests/channels/pjsip/resolver/srv/failover_udp/configs/ast1/pjsip.conf
R tests/channels/pjsip/resolver/srv/failover_udp/configs/ast1/resolver_unbound.conf
R tests/channels/pjsip/resolver/srv/failover_udp/dns_zones/example.com
R tests/channels/pjsip/resolver/srv/failover_udp/sipp/uas-503.xml
A tests/channels/pjsip/resolver/srv/failover_udp/sipp/uas-ignore.xml
R tests/channels/pjsip/resolver/srv/failover_udp/test-config.yaml
M tests/channels/pjsip/resolver/srv/tests.yaml
60 files changed, 26 insertions(+), 1,218 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/91/791/1

diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/tests.yaml b/tests/channels/pjsip/resolver/srv/failover/in_dialog/tests.yaml
deleted file mode 100644
index 2a2f308..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/tests.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-# Enter tests here in the order they should be considered for execution:
-tests:
-    - test: 'transport_tcp'
-    - test: 'transport_udp'
-    - test: 'transport_unspecified'
-    - test: 'timeout'
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/timeout/configs/ast1/extensions.conf b/tests/channels/pjsip/resolver/srv/failover/in_dialog/timeout/configs/ast1/extensions.conf
deleted file mode 100644
index 277ddae..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/timeout/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[default]
-exten => udp,1,NoOp()
-      same => n,Dial(PJSIP/jenny/sip:example.com\;transport=udp)
-      same => n,Hangup()
-
-exten => tcp,1,NoOp()
-      same => n,Dial(PJSIP/jenny/sip:example.com\;transport=tcp)
-      same => n,Hangup()
-
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/timeout/configs/ast1/pjsip.conf b/tests/channels/pjsip/resolver/srv/failover/in_dialog/timeout/configs/ast1/pjsip.conf
deleted file mode 100644
index 479d6cc..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/timeout/configs/ast1/pjsip.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[transport=udp]
-type=transport
-protocol=udp
-bind=0.0.0.0:5060
-
-[transport=tcp]
-type=transport
-protocol=tcp
-bind=0.0.0.0:5060
-
-[jenny]
-type=endpoint
-context=default
-allow=!all,ulaw,alaw,g722
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/timeout/dns_zones/example.com b/tests/channels/pjsip/resolver/srv/failover/in_dialog/timeout/dns_zones/example.com
deleted file mode 100644
index 209954c..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/timeout/dns_zones/example.com
+++ /dev/null
@@ -1,36 +0,0 @@
-zone = [
-    SOA(
-        # For whom we are the authority
-        'example.com',
-
-        # This nameserver's name
-        mname = "ns1.example.com",
-
-        # Mailbox of individual who handles this
-        rname = "root.example.com",
-
-        # Unique serial identifying this SOA data
-        serial = 2003010601,
-
-        # Time interval before zone should be refreshed
-        refresh = "1H",
-
-        # Interval before failed refresh should be retried
-        retry = "1H",
-
-        # Upper limit on time interval before expiry
-        expire = "1H",
-
-        # Minimum TTL
-        minimum = "1H"
-    ),
-
-    SRV('_sip._udp.example.com', 0, 10, 5062, 'fast.pbx.example.com'),
-    SRV('_sip._udp.example.com', 1, 0, 5063, 'slow.pbx.example.com'),
-
-    SRV('_sip._tcp.example.com', 0, 0, 5064, 'fast.pbx.example.com'),
-    SRV('_sip._tcp.example.com', 1, 10, 5065, 'slow.pbx.example.com'),
-
-    A('fast.pbx.example.com', '127.0.0.1'),
-    A('slow.pbx.example.com', '127.0.0.1'),
-]
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/timeout/sipp/uas-ignore.xml b/tests/channels/pjsip/resolver/srv/failover/in_dialog/timeout/sipp/uas-ignore.xml
deleted file mode 100644
index c375373..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/timeout/sipp/uas-ignore.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Receive INVITE with audio, ignore">
-  <Global variables="remote_tag" />
-  <recv request="INVITE" crlf="true">
-      <!-- Save the from tag. We'll need it when we send our BYE -->
-      <action>
-          <ereg regexp=".*(;tag=.*)"
-              header="From:"
-              search_in="hdr"
-              check_it="true"
-              assign_to="remote_tag"/>
-	  </action>
-  </recv>
-
-  <send>
-    <![CDATA[
-
-      SIP/2.0 180 Ringing
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[pid]SIPpTag01[call_number]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <send retrans="500">
-    <![CDATA[
-
-      SIP/2.0 200 OK
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[pid]SIPpTag01[call_number]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
-      Content-Type: application/sdp
-      Content-Length: [len]
-
-      v=0
-      o=- 1324901698 1324901698 IN IP4 [local_ip]
-      s=-
-      c=IN IP4 [local_ip]
-      t=0 0
-      m=audio 2226 RTP/AVP 0 101
-      a=sendrecv
-      a=rtpmap:0 PCMU/8000
-      a=rtpmap:101 telephone-event/8000
-    ]]>
-  </send>
-
-  <recv request="ACK" rtd="true" crlf="true" />
-
-  <send retrans="500">
-    <![CDATA[
-
-      BYE sip:jenny@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:jenny@[local_ip]:[local_port]>;tag=[pid]SIPpTag01[call_number]
-      To: [$remote_tag]
-      [last_Call-ID:]
-      CSeq: [cseq] BYE
-      Contact: sip:jenny@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <recv response="200" />
-</scenario>
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/timeout/test-config.yaml b/tests/channels/pjsip/resolver/srv/failover/in_dialog/timeout/test-config.yaml
deleted file mode 100644
index 8b3515b..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/timeout/test-config.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-testinfo:
-    summary: 'Test in dialog SRV failover upon a timeout'
-    description: |
-        Using an in SIP message (in this case a SIP INVITE), this test
-        verifies that an SRV record lookup resulting in multiple results
-        will successfully fail over, after timing out, to other records if
-        previous ones do not respond.
-
-test-modules:
-    test-object:
-        config-section: test-object-config
-        typename: 'sipp.SIPpTestCase'
-    modules:
-        -
-            config-section: originator-udp
-            typename: 'pluggable_modules.Originator'
-        -
-            config-section: originator-tcp
-            typename: 'pluggable_modules.Originator'
-        -
-            config-section: dns-server-config
-            typename: 'dns_server.DNSServer'
-
-test-object-config:
-    reactor-timeout: 60
-    test-iterations:
-        -
-            scenarios:
-                - { 'key-args': {'scenario': 'uas-ignore.xml', '-i': '127.0.0.1', '-p': '5063', '-timeout': '60s'} }
-                - { 'key-args': {'scenario': 'uas-ignore.xml', '-i': '127.0.0.1', '-p': '5065', '-t': 't1', '-timeout': '60s'} }
-
-originator-udp:
-    scenario-trigger-after: '2'
-    channel: 'Local/udp at default'
-    async: 'True'
-    timeout: 60
-
-originator-tcp:
-    scenario-trigger-after: '2'
-    channel: 'Local/tcp at default'
-    async: 'True'
-    timeout: 60
-
-dns-server-config:
-    python-zones:
-        -
-            example.com
-
-properties:
-    minversion: '14.0.0'
-    dependencies:
-        - app : 'sipp'
-        - asterisk : 'res_pjsip'
-        - asterisk : 'res_resolver_unbound'
-    tags:
-        - pjsip
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/configs/ast1/extensions.conf b/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/configs/ast1/extensions.conf
deleted file mode 100644
index 1de5b55..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[default]
-exten => s,1,NoOp()
-      same => n,Dial(PJSIP/jenny/sip:example.com\;transport=tcp,5)
-      same => n,Hangup()
-
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/configs/ast1/pjsip.conf b/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/configs/ast1/pjsip.conf
deleted file mode 100644
index 9f2e92b..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/configs/ast1/pjsip.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[transport=tcp]
-type=transport
-protocol=tcp
-bind=0.0.0.0:5060
-
-[jenny]
-type=endpoint
-context=default
-allow=!all,ulaw,alaw,g722
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/configs/ast1/resolver_unbound.conf b/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/configs/ast1/resolver_unbound.conf
deleted file mode 100644
index 38ef153..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/configs/ast1/resolver_unbound.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[general]
-nameserver = 127.0.0.1 at 10053
-resolv =
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/dns_zones/example.com b/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/dns_zones/example.com
deleted file mode 100644
index 9ac96ee..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/dns_zones/example.com
+++ /dev/null
@@ -1,36 +0,0 @@
-zone = [
-    SOA(
-        # For whom we are the authority
-        'example.com',
-
-        # This nameserver's name
-        mname = "ns1.example.com",
-
-        # Mailbox of individual who handles this
-        rname = "root.example.com",
-
-        # Unique serial identifying this SOA data
-        serial = 2003010601,
-
-        # Time interval before zone should be refreshed
-        refresh = "1H",
-
-        # Interval before failed refresh should be retried
-        retry = "1H",
-
-        # Upper limit on time interval before expiry
-        expire = "1H",
-
-        # Minimum TTL
-        minimum = "1H"
-    ),
-
-    SRV('_sip._udp.example.com', 0, 10, 5061, 'fast.pbx.example.com'),
-    SRV('_sip._udp.example.com', 1, 0, 5062, 'slow.pbx.example.com'),
-
-    SRV('_sip._tcp.example.com', 0, 0, 5061, 'fast.pbx.example.com'),
-    SRV('_sip._tcp.example.com', 1, 10, 5062, 'slow.pbx.example.com'),
-
-    A('fast.pbx.example.com', '127.0.0.1'),
-    A('slow.pbx.example.com', '127.0.0.1'),
-]
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/sipp/uas-503.xml b/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/sipp/uas-503.xml
deleted file mode 100644
index c31ddce..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/sipp/uas-503.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Receive INVITE with audio, immediately reject with a 503">
-  <recv request="INVITE" crlf="true">
-  </recv>
-
-  <send retrans="500">
-    <![CDATA[
-
-      SIP/2.0 503 Service Unavailable
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[call_number]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
-    ]]>
-  </send>
-</scenario>
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/sipp/uas-ignore.xml b/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/sipp/uas-ignore.xml
deleted file mode 100644
index c375373..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/sipp/uas-ignore.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Receive INVITE with audio, ignore">
-  <Global variables="remote_tag" />
-  <recv request="INVITE" crlf="true">
-      <!-- Save the from tag. We'll need it when we send our BYE -->
-      <action>
-          <ereg regexp=".*(;tag=.*)"
-              header="From:"
-              search_in="hdr"
-              check_it="true"
-              assign_to="remote_tag"/>
-	  </action>
-  </recv>
-
-  <send>
-    <![CDATA[
-
-      SIP/2.0 180 Ringing
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[pid]SIPpTag01[call_number]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <send retrans="500">
-    <![CDATA[
-
-      SIP/2.0 200 OK
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[pid]SIPpTag01[call_number]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
-      Content-Type: application/sdp
-      Content-Length: [len]
-
-      v=0
-      o=- 1324901698 1324901698 IN IP4 [local_ip]
-      s=-
-      c=IN IP4 [local_ip]
-      t=0 0
-      m=audio 2226 RTP/AVP 0 101
-      a=sendrecv
-      a=rtpmap:0 PCMU/8000
-      a=rtpmap:101 telephone-event/8000
-    ]]>
-  </send>
-
-  <recv request="ACK" rtd="true" crlf="true" />
-
-  <send retrans="500">
-    <![CDATA[
-
-      BYE sip:jenny@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:jenny@[local_ip]:[local_port]>;tag=[pid]SIPpTag01[call_number]
-      To: [$remote_tag]
-      [last_Call-ID:]
-      CSeq: [cseq] BYE
-      Contact: sip:jenny@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <recv response="200" />
-</scenario>
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/test-config.yaml b/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/test-config.yaml
deleted file mode 100644
index 886c25f..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_tcp/test-config.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-testinfo:
-    summary: 'Test in-dialog SRV failover using a TCP transport'
-    description: |
-        Using an in-dialog SIP message (in this case a SIP INVITE) over a TCP
-        transport, this test verifies that an SRV record lookup resulting in
-        multiple results will successfully fail over to other records if
-        previous ones do not respond.
-
-test-modules:
-    test-object:
-        config-section: test-object-config
-        typename: 'sipp.SIPpTestCase'
-    modules:
-        -
-            config-section: originator
-            typename: 'pluggable_modules.Originator'
-        -
-            config-section: dns-server-config
-            typename: 'dns_server.DNSServer'
-
-test-object-config:
-    test-iterations:
-        -
-            scenarios:
-                - { 'key-args': {'scenario': 'uas-503.xml', '-i': '127.0.0.1', '-p': '5061', '-t': 't1'} }
-                - { 'key-args': {'scenario': 'uas-ignore.xml', '-i': '127.0.0.1', '-p': '5062', '-t': 't1'} }
-
-originator:
-    scenario-trigger-after: '2'
-    channel: 'Local/s at default'
-    async: 'True'
-
-dns-server-config:
-    python-zones:
-        -
-            example.com
-
-properties:
-    minversion: '14.0.0'
-    dependencies:
-        - app : 'sipp'
-        - asterisk : 'res_pjsip'
-        - asterisk : 'res_resolver_unbound'
-    tags:
-        - pjsip
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_udp/configs/ast1/extensions.conf b/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_udp/configs/ast1/extensions.conf
deleted file mode 100644
index f344a1d..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_udp/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[default]
-exten => s,1,NoOp()
-      same => n,Dial(PJSIP/jenny/sip:example.com\;transport=udp,5)
-      same => n,Hangup()
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_udp/configs/ast1/resolver_unbound.conf b/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_udp/configs/ast1/resolver_unbound.conf
deleted file mode 100644
index 38ef153..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_udp/configs/ast1/resolver_unbound.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[general]
-nameserver = 127.0.0.1 at 10053
-resolv =
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_udp/dns_zones/example.com b/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_udp/dns_zones/example.com
deleted file mode 100644
index 9ac96ee..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_udp/dns_zones/example.com
+++ /dev/null
@@ -1,36 +0,0 @@
-zone = [
-    SOA(
-        # For whom we are the authority
-        'example.com',
-
-        # This nameserver's name
-        mname = "ns1.example.com",
-
-        # Mailbox of individual who handles this
-        rname = "root.example.com",
-
-        # Unique serial identifying this SOA data
-        serial = 2003010601,
-
-        # Time interval before zone should be refreshed
-        refresh = "1H",
-
-        # Interval before failed refresh should be retried
-        retry = "1H",
-
-        # Upper limit on time interval before expiry
-        expire = "1H",
-
-        # Minimum TTL
-        minimum = "1H"
-    ),
-
-    SRV('_sip._udp.example.com', 0, 10, 5061, 'fast.pbx.example.com'),
-    SRV('_sip._udp.example.com', 1, 0, 5062, 'slow.pbx.example.com'),
-
-    SRV('_sip._tcp.example.com', 0, 0, 5061, 'fast.pbx.example.com'),
-    SRV('_sip._tcp.example.com', 1, 10, 5062, 'slow.pbx.example.com'),
-
-    A('fast.pbx.example.com', '127.0.0.1'),
-    A('slow.pbx.example.com', '127.0.0.1'),
-]
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_udp/sipp/uas-ignore.xml b/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_udp/sipp/uas-ignore.xml
deleted file mode 100644
index c375373..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_udp/sipp/uas-ignore.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Receive INVITE with audio, ignore">
-  <Global variables="remote_tag" />
-  <recv request="INVITE" crlf="true">
-      <!-- Save the from tag. We'll need it when we send our BYE -->
-      <action>
-          <ereg regexp=".*(;tag=.*)"
-              header="From:"
-              search_in="hdr"
-              check_it="true"
-              assign_to="remote_tag"/>
-	  </action>
-  </recv>
-
-  <send>
-    <![CDATA[
-
-      SIP/2.0 180 Ringing
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[pid]SIPpTag01[call_number]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <send retrans="500">
-    <![CDATA[
-
-      SIP/2.0 200 OK
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[pid]SIPpTag01[call_number]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
-      Content-Type: application/sdp
-      Content-Length: [len]
-
-      v=0
-      o=- 1324901698 1324901698 IN IP4 [local_ip]
-      s=-
-      c=IN IP4 [local_ip]
-      t=0 0
-      m=audio 2226 RTP/AVP 0 101
-      a=sendrecv
-      a=rtpmap:0 PCMU/8000
-      a=rtpmap:101 telephone-event/8000
-    ]]>
-  </send>
-
-  <recv request="ACK" rtd="true" crlf="true" />
-
-  <send retrans="500">
-    <![CDATA[
-
-      BYE sip:jenny@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:jenny@[local_ip]:[local_port]>;tag=[pid]SIPpTag01[call_number]
-      To: [$remote_tag]
-      [last_Call-ID:]
-      CSeq: [cseq] BYE
-      Contact: sip:jenny@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <recv response="200" />
-</scenario>
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/configs/ast1/extensions.conf b/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/configs/ast1/extensions.conf
deleted file mode 100644
index 23a76e1..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[default]
-exten => s,1,NoOp()
-      same => n,Dial(PJSIP/jenny/sip:example.com,5)
-      same => n,Hangup()
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/configs/ast1/pjsip.conf b/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/configs/ast1/pjsip.conf
deleted file mode 100644
index ecded1b..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/configs/ast1/pjsip.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[transport=tcp]
-type=transport
-protocol=tcp
-bind=0.0.0.0:5060
-
-[transport=udp]
-type=transport
-protocol=udp
-bind=0.0.0.0:5061
-
-[jenny]
-type=endpoint
-context=default
-allow=!all,ulaw,alaw,g722
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/configs/ast1/resolver_unbound.conf b/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/configs/ast1/resolver_unbound.conf
deleted file mode 100644
index 38ef153..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/configs/ast1/resolver_unbound.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[general]
-nameserver = 127.0.0.1 at 10053
-resolv =
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/sipp/uas-503.xml b/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/sipp/uas-503.xml
deleted file mode 100644
index c31ddce..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/sipp/uas-503.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Receive INVITE with audio, immediately reject with a 503">
-  <recv request="INVITE" crlf="true">
-  </recv>
-
-  <send retrans="500">
-    <![CDATA[
-
-      SIP/2.0 503 Service Unavailable
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[call_number]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
-    ]]>
-  </send>
-</scenario>
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/sipp/uas-ignore.xml b/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/sipp/uas-ignore.xml
deleted file mode 100644
index c375373..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/sipp/uas-ignore.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Receive INVITE with audio, ignore">
-  <Global variables="remote_tag" />
-  <recv request="INVITE" crlf="true">
-      <!-- Save the from tag. We'll need it when we send our BYE -->
-      <action>
-          <ereg regexp=".*(;tag=.*)"
-              header="From:"
-              search_in="hdr"
-              check_it="true"
-              assign_to="remote_tag"/>
-	  </action>
-  </recv>
-
-  <send>
-    <![CDATA[
-
-      SIP/2.0 180 Ringing
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[pid]SIPpTag01[call_number]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <send retrans="500">
-    <![CDATA[
-
-      SIP/2.0 200 OK
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[pid]SIPpTag01[call_number]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
-      Content-Type: application/sdp
-      Content-Length: [len]
-
-      v=0
-      o=- 1324901698 1324901698 IN IP4 [local_ip]
-      s=-
-      c=IN IP4 [local_ip]
-      t=0 0
-      m=audio 2226 RTP/AVP 0 101
-      a=sendrecv
-      a=rtpmap:0 PCMU/8000
-      a=rtpmap:101 telephone-event/8000
-    ]]>
-  </send>
-
-  <recv request="ACK" rtd="true" crlf="true" />
-
-  <send retrans="500">
-    <![CDATA[
-
-      BYE sip:jenny@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:jenny@[local_ip]:[local_port]>;tag=[pid]SIPpTag01[call_number]
-      To: [$remote_tag]
-      [last_Call-ID:]
-      CSeq: [cseq] BYE
-      Contact: sip:jenny@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <recv response="200" />
-</scenario>
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/test-config.yaml b/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/test-config.yaml
deleted file mode 100644
index c5c8f80..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/test-config.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-testinfo:
-    summary: 'Test in-dialog SRV failover using an unspecified transport'
-    description: |
-        Using an in-dialog SIP message (in this case a SIP INVITE) with an
-        unspecified transport, this test verifies that an SRV record lookup
-        resulting in multiple results will successfully fail over to other
-        records if previous ones do not respond.
-
-        Since the transport is unspecified TCP is given priority and should
-        be selected first. Once this fails the only option left is UDP, so it
-        should then switch transport types when attempting the secondary
-        failover address.
-
-test-modules:
-    test-object:
-        config-section: test-object-config
-        typename: 'sipp.SIPpTestCase'
-    modules:
-        -
-            config-section: originator
-            typename: 'pluggable_modules.Originator'
-        -
-            config-section: dns-server-config
-            typename: 'dns_server.DNSServer'
-
-test-object-config:
-    test-iterations:
-        -
-            scenarios:
-                - { 'key-args': {'scenario': 'uas-503.xml', '-i': '127.0.0.1', '-p': '5062', '-t': 't1'} }
-                - { 'key-args': {'scenario': 'uas-ignore.xml', '-i': '127.0.0.1', '-p': '5063'} }
-
-originator:
-    scenario-trigger-after: '2'
-    channel: 'Local/s at default'
-    async: 'True'
-
-dns-server-config:
-    python-zones:
-        -
-            example.com
-
-properties:
-    minversion: '14.0.0'
-    dependencies:
-        - app : 'sipp'
-        - asterisk : 'res_pjsip'
-        - asterisk : 'res_resolver_unbound'
-    tags:
-        - pjsip
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/tests.yaml b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/tests.yaml
deleted file mode 100644
index 2a2f308..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/tests.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-# Enter tests here in the order they should be considered for execution:
-tests:
-    - test: 'transport_tcp'
-    - test: 'transport_udp'
-    - test: 'transport_unspecified'
-    - test: 'timeout'
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/timeout/configs/ast1/extensions.conf b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/timeout/configs/ast1/extensions.conf
deleted file mode 100644
index d99eaa8..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/timeout/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[default]
-exten => udp,1,NoOp()
-      same => n,Set(MESSAGE(body)=call me, maybe)
-      same => n,MessageSend(pjsip:example.com;transport=udp,sip:127.0.0.1)
-      same => n,Hangup()
-
-exten => tcp,1,NoOp()
-      same => n,Set(MESSAGE(body)=call me, maybe)
-      same => n,MessageSend(pjsip:example.com;transport=tcp,sip:127.0.0.1)
-      same => n,Hangup()
-
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/timeout/configs/ast1/pjsip.conf b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/timeout/configs/ast1/pjsip.conf
deleted file mode 100644
index 6d10326..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/timeout/configs/ast1/pjsip.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-[global]
-type=global
-debug=yes
-default_outbound_endpoint=outbound_endpoint
-
-[transport=udp]
-type=transport
-protocol=udp
-bind=0.0.0.0:5060
-
-[transport=tcp]
-type=transport
-protocol=tcp
-bind=0.0.0.0:5061
-
-[outbound_endpoint]
-type=endpoint
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/timeout/configs/ast1/resolver_unbound.conf b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/timeout/configs/ast1/resolver_unbound.conf
deleted file mode 100644
index 38ef153..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/timeout/configs/ast1/resolver_unbound.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[general]
-nameserver = 127.0.0.1 at 10053
-resolv =
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/timeout/dns_zones/example.com b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/timeout/dns_zones/example.com
deleted file mode 100644
index 209954c..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/timeout/dns_zones/example.com
+++ /dev/null
@@ -1,36 +0,0 @@
-zone = [
-    SOA(
-        # For whom we are the authority
-        'example.com',
-
-        # This nameserver's name
-        mname = "ns1.example.com",
-
-        # Mailbox of individual who handles this
-        rname = "root.example.com",
-
-        # Unique serial identifying this SOA data
-        serial = 2003010601,
-
-        # Time interval before zone should be refreshed
-        refresh = "1H",
-
-        # Interval before failed refresh should be retried
-        retry = "1H",
-
-        # Upper limit on time interval before expiry
-        expire = "1H",
-
-        # Minimum TTL
-        minimum = "1H"
-    ),
-
-    SRV('_sip._udp.example.com', 0, 10, 5062, 'fast.pbx.example.com'),
-    SRV('_sip._udp.example.com', 1, 0, 5063, 'slow.pbx.example.com'),
-
-    SRV('_sip._tcp.example.com', 0, 0, 5064, 'fast.pbx.example.com'),
-    SRV('_sip._tcp.example.com', 1, 10, 5065, 'slow.pbx.example.com'),
-
-    A('fast.pbx.example.com', '127.0.0.1'),
-    A('slow.pbx.example.com', '127.0.0.1'),
-]
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/timeout/sipp/uas-ignore.xml b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/timeout/sipp/uas-ignore.xml
deleted file mode 100644
index f9908a1..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/timeout/sipp/uas-ignore.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Receive MESSAGE, ignore">
-  <recv request="MESSAGE" crlf="true">
-  </recv>
-</scenario>
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/timeout/test-config.yaml b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/timeout/test-config.yaml
deleted file mode 100644
index 12a6c90..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/timeout/test-config.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-testinfo:
-    summary: 'Test out of dialog SRV failover upon a timeout'
-    description: |
-        Using an out of dialog SIP message (in this case a SIP MESSAGE), this
-        test verifies that an SRV record lookup resulting in multiple results
-        will successfully fail over, after timing out, to other records if
-        previous ones do not respond.
-
-test-modules:
-    test-object:
-        config-section: test-object-config
-        typename: 'sipp.SIPpTestCase'
-    modules:
-        -
-            config-section: originator-udp
-            typename: 'pluggable_modules.Originator'
-        -
-            config-section: originator-tcp
-            typename: 'pluggable_modules.Originator'
-        -
-            config-section: dns-server-config
-            typename: 'dns_server.DNSServer'
-
-test-object-config:
-    reactor-timeout: 60
-    test-iterations:
-        -
-            scenarios:
-                - { 'key-args': {'scenario': 'uas-ignore.xml', '-i': '127.0.0.1', '-p': '5063', '-timeout': '60s'} }
-                - { 'key-args': {'scenario': 'uas-ignore.xml', '-i': '127.0.0.1', '-p': '5065', '-t': 't1', '-timeout': '60s'} }
-
-originator-udp:
-    scenario-trigger-after: '2'
-    channel: 'Local/udp at default'
-    async: 'True'
-    timeout: 60
-
-originator-tcp:
-    scenario-trigger-after: '2'
-    channel: 'Local/tcp at default'
-    async: 'True'
-    timeout: 60
-
-dns-server-config:
-    python-zones:
-        -
-            example.com
-
-properties:
-    minversion: '14.0.0'
-    dependencies:
-        - app : 'sipp'
-        - asterisk : 'res_pjsip'
-        - asterisk : 'res_resolver_unbound'
-    tags:
-        - pjsip
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/configs/ast1/extensions.conf b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/configs/ast1/extensions.conf
deleted file mode 100644
index ee1a687..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[default]
-exten => s,1,NoOp()
-      same => n,Set(MESSAGE(body)=call me, maybe)
-      same => n,MessageSend(pjsip:example.com;transport=tcp,sip:127.0.0.1)
-      same => n,Hangup()
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/configs/ast1/pjsip.conf b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/configs/ast1/pjsip.conf
deleted file mode 100644
index 855a008..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/configs/ast1/pjsip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[global]
-type=global
-debug=yes
-default_outbound_endpoint=outbound_endpoint
-
-[transport=tcp]
-type=transport
-protocol=tcp
-bind=0.0.0.0:5060
-
-[outbound_endpoint]
-type=endpoint
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/configs/ast1/resolver_unbound.conf b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/configs/ast1/resolver_unbound.conf
deleted file mode 100644
index 38ef153..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/configs/ast1/resolver_unbound.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[general]
-nameserver = 127.0.0.1 at 10053
-resolv =
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/dns_zones/example.com b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/dns_zones/example.com
deleted file mode 100644
index 9ac96ee..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/dns_zones/example.com
+++ /dev/null
@@ -1,36 +0,0 @@
-zone = [
-    SOA(
-        # For whom we are the authority
-        'example.com',
-
-        # This nameserver's name
-        mname = "ns1.example.com",
-
-        # Mailbox of individual who handles this
-        rname = "root.example.com",
-
-        # Unique serial identifying this SOA data
-        serial = 2003010601,
-
-        # Time interval before zone should be refreshed
-        refresh = "1H",
-
-        # Interval before failed refresh should be retried
-        retry = "1H",
-
-        # Upper limit on time interval before expiry
-        expire = "1H",
-
-        # Minimum TTL
-        minimum = "1H"
-    ),
-
-    SRV('_sip._udp.example.com', 0, 10, 5061, 'fast.pbx.example.com'),
-    SRV('_sip._udp.example.com', 1, 0, 5062, 'slow.pbx.example.com'),
-
-    SRV('_sip._tcp.example.com', 0, 0, 5061, 'fast.pbx.example.com'),
-    SRV('_sip._tcp.example.com', 1, 10, 5062, 'slow.pbx.example.com'),
-
-    A('fast.pbx.example.com', '127.0.0.1'),
-    A('slow.pbx.example.com', '127.0.0.1'),
-]
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/sipp/uas-503.xml b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/sipp/uas-503.xml
deleted file mode 100644
index 5d6864a..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/sipp/uas-503.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Receive MESSAGE, immediately reject with a 503">
-  <recv request="MESSAGE" crlf="true">
-  </recv>
-
-  <send retrans="500">
-    <![CDATA[
-
-      SIP/2.0 503 Service Unavailable
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[call_number]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
-    ]]>
-  </send>
-</scenario>
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/sipp/uas-ignore.xml b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/sipp/uas-ignore.xml
deleted file mode 100644
index f9908a1..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/sipp/uas-ignore.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Receive MESSAGE, ignore">
-  <recv request="MESSAGE" crlf="true">
-  </recv>
-</scenario>
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/test-config.yaml b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/test-config.yaml
deleted file mode 100644
index ee873fd..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_tcp/test-config.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-testinfo:
-    summary: 'Test out of dialog SRV failover using a TCP transport'
-    description: |
-        Using an out of dialog SIP message (in this case a SIP MESSAGE) over a
-        TCP transport, this test verifies that an SRV record lookup resulting in
-        multiple results will successfully fail over to other records if
-        previous ones do not respond.
-
-test-modules:
-    test-object:
-        config-section: test-object-config
-        typename: 'sipp.SIPpTestCase'
-    modules:
-        -
-            config-section: originator
-            typename: 'pluggable_modules.Originator'
-        -
-            config-section: dns-server-config
-            typename: 'dns_server.DNSServer'
-
-test-object-config:
-    test-iterations:
-        -
-            scenarios:
-                - { 'key-args': {'scenario': 'uas-503.xml', '-i': '127.0.0.1', '-p': '5061', '-t': 't1'} }
-                - { 'key-args': {'scenario': 'uas-ignore.xml', '-i': '127.0.0.1', '-p': '5062', '-t': 't1'} }
-
-originator:
-    scenario-trigger-after: '2'
-    channel: 'Local/s at default'
-    async: 'True'
-
-dns-server-config:
-    python-zones:
-        -
-            example.com
-
-properties:
-    minversion: '14.0.0'
-    dependencies:
-        - app : 'sipp'
-        - asterisk : 'res_pjsip'
-        - asterisk : 'res_resolver_unbound'
-    tags:
-        - pjsip
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/configs/ast1/extensions.conf b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/configs/ast1/extensions.conf
deleted file mode 100644
index 3c9205a..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[default]
-exten => s,1,NoOp()
-      same => n,Set(MESSAGE(body)=call me, maybe)
-      same => n,MessageSend(pjsip:example.com;transport=udp,sip:127.0.0.1)
-      same => n,Hangup()
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/configs/ast1/pjsip.conf b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/configs/ast1/pjsip.conf
deleted file mode 100644
index de62da7..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/configs/ast1/pjsip.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[global]
-type=global
-debug=yes
-default_outbound_endpoint=outbound_endpoint
-
-[transport=udp]
-type=transport
-protocol=udp
-bind=0.0.0.0:5060
-
-[outbound_endpoint]
-type=endpoint
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/configs/ast1/resolver_unbound.conf b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/configs/ast1/resolver_unbound.conf
deleted file mode 100644
index 38ef153..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/configs/ast1/resolver_unbound.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[general]
-nameserver = 127.0.0.1 at 10053
-resolv =
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/dns_zones/example.com b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/dns_zones/example.com
deleted file mode 100644
index 9ac96ee..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/dns_zones/example.com
+++ /dev/null
@@ -1,36 +0,0 @@
-zone = [
-    SOA(
-        # For whom we are the authority
-        'example.com',
-
-        # This nameserver's name
-        mname = "ns1.example.com",
-
-        # Mailbox of individual who handles this
-        rname = "root.example.com",
-
-        # Unique serial identifying this SOA data
-        serial = 2003010601,
-
-        # Time interval before zone should be refreshed
-        refresh = "1H",
-
-        # Interval before failed refresh should be retried
-        retry = "1H",
-
-        # Upper limit on time interval before expiry
-        expire = "1H",
-
-        # Minimum TTL
-        minimum = "1H"
-    ),
-
-    SRV('_sip._udp.example.com', 0, 10, 5061, 'fast.pbx.example.com'),
-    SRV('_sip._udp.example.com', 1, 0, 5062, 'slow.pbx.example.com'),
-
-    SRV('_sip._tcp.example.com', 0, 0, 5061, 'fast.pbx.example.com'),
-    SRV('_sip._tcp.example.com', 1, 10, 5062, 'slow.pbx.example.com'),
-
-    A('fast.pbx.example.com', '127.0.0.1'),
-    A('slow.pbx.example.com', '127.0.0.1'),
-]
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/sipp/uas-503.xml b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/sipp/uas-503.xml
deleted file mode 100644
index 5d6864a..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/sipp/uas-503.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Receive MESSAGE, immediately reject with a 503">
-  <recv request="MESSAGE" crlf="true">
-  </recv>
-
-  <send retrans="500">
-    <![CDATA[
-
-      SIP/2.0 503 Service Unavailable
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[call_number]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
-    ]]>
-  </send>
-</scenario>
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/sipp/uas-ignore.xml b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/sipp/uas-ignore.xml
deleted file mode 100644
index f9908a1..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/sipp/uas-ignore.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Receive MESSAGE, ignore">
-  <recv request="MESSAGE" crlf="true">
-  </recv>
-</scenario>
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/test-config.yaml b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/test-config.yaml
deleted file mode 100644
index dbab4d5..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_udp/test-config.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-testinfo:
-    summary: 'Test out of dialog SRV failover using a UDP transport'
-    description: |
-        Using an out of dialog SIP message (in this case a SIP MESSAGE) over a
-        UDP transport, this test verifies that an SRV record lookup resulting in
-        multiple results will successfully fail over to other records if
-        previous ones do not respond.
-
-test-modules:
-    test-object:
-        config-section: test-object-config
-        typename: 'sipp.SIPpTestCase'
-    modules:
-        -
-            config-section: originator
-            typename: 'pluggable_modules.Originator'
-        -
-            config-section: dns-server-config
-            typename: 'dns_server.DNSServer'
-
-test-object-config:
-    test-iterations:
-        -
-            scenarios:
-                - { 'key-args': {'scenario': 'uas-503.xml', '-i': '127.0.0.1', '-p': '5061'} }
-                - { 'key-args': {'scenario': 'uas-ignore.xml', '-i': '127.0.0.1', '-p': '5062'} }
-
-originator:
-    scenario-trigger-after: '2'
-    channel: 'Local/s at default'
-    async: 'True'
-
-dns-server-config:
-    python-zones:
-        -
-            example.com
-
-properties:
-    minversion: '14.0.0'
-    dependencies:
-        - app : 'sipp'
-        - asterisk : 'res_pjsip'
-        - asterisk : 'res_resolver_unbound'
-    tags:
-        - pjsip
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/configs/ast1/extensions.conf b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/configs/ast1/extensions.conf
deleted file mode 100644
index ae3a8c2..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/configs/ast1/extensions.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[default]
-exten => s,1,NoOp()
-      same => n,Set(MESSAGE(body)=call me, maybe)
-      same => n,MessageSend(pjsip:example.com,sip:127.0.0.1)
-      same => n,Hangup()
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/configs/ast1/pjsip.conf b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/configs/ast1/pjsip.conf
deleted file mode 100644
index 9ac2d29..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/configs/ast1/pjsip.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-[global]
-type=global
-debug=yes
-default_outbound_endpoint=outbound_endpoint
-
-[transport=tcp]
-type=transport
-protocol=tcp
-bind=0.0.0.0:5060
-
-[transport=udp]
-type=transport
-protocol=udp
-bind=0.0.0.0:5061
-
-[outbound_endpoint]
-type=endpoint
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/configs/ast1/resolver_unbound.conf b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/configs/ast1/resolver_unbound.conf
deleted file mode 100644
index 38ef153..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/configs/ast1/resolver_unbound.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[general]
-nameserver = 127.0.0.1 at 10053
-resolv =
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/dns_zones/example.com b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/dns_zones/example.com
deleted file mode 100644
index c0a6669..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/dns_zones/example.com
+++ /dev/null
@@ -1,33 +0,0 @@
-zone = [
-    SOA(
-        # For whom we are the authority
-        'example.com',
-
-        # This nameserver's name
-        mname = "ns1.example.com",
-
-        # Mailbox of individual who handles this
-        rname = "root.example.com",
-
-        # Unique serial identifying this SOA data
-        serial = 2003010601,
-
-        # Time interval before zone should be refreshed
-        refresh = "1H",
-
-        # Interval before failed refresh should be retried
-        retry = "1H",
-
-        # Upper limit on time interval before expiry
-        expire = "1H",
-
-        # Minimum TTL
-        minimum = "1H"
-    ),
-
-    SRV('_sip._udp.example.com', 1, 0, 5063, 'slow.pbx.example.com'),
-    SRV('_sip._tcp.example.com', 0, 0, 5062, 'fast.pbx.example.com'),
-
-    A('fast.pbx.example.com', '127.0.0.1'),
-    A('slow.pbx.example.com', '127.0.0.1'),
-]
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/sipp/uas-503.xml b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/sipp/uas-503.xml
deleted file mode 100644
index 5d6864a..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/sipp/uas-503.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Receive MESSAGE, immediately reject with a 503">
-  <recv request="MESSAGE" crlf="true">
-  </recv>
-
-  <send retrans="500">
-    <![CDATA[
-
-      SIP/2.0 503 Service Unavailable
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[call_number]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
-    ]]>
-  </send>
-</scenario>
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/sipp/uas-ignore.xml b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/sipp/uas-ignore.xml
deleted file mode 100644
index f9908a1..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/sipp/uas-ignore.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Receive MESSAGE, ignore">
-  <recv request="MESSAGE" crlf="true">
-  </recv>
-</scenario>
diff --git a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/test-config.yaml b/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/test-config.yaml
deleted file mode 100644
index cdfc6b3..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/out_of_dialog/transport_unspecified/test-config.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-testinfo:
-    summary: 'Test out of dialog SRV failover using an unspecified transport'
-    description: |
-        Using an out of dialog SIP message (in this case a SIP MESSAGE) with an
-        unspecified transport, this test verifies that an SRV record lookup
-        resulting in multiple results will successfully fail over to other
-        records if previous ones do not respond.
-
-        Since the transport is unspecified TCP is given priority and should
-        be selected first. Once this fails the only option left is UDP, so it
-        should then switch transport types when attempting the secondary
-        failover address.
-
-test-modules:
-    test-object:
-        config-section: test-object-config
-        typename: 'sipp.SIPpTestCase'
-    modules:
-        -
-            config-section: originator
-            typename: 'pluggable_modules.Originator'
-        -
-            config-section: dns-server-config
-            typename: 'dns_server.DNSServer'
-
-test-object-config:
-    test-iterations:
-        -
-            scenarios:
-                - { 'key-args': {'scenario': 'uas-503.xml', '-i': '127.0.0.1', '-p': '5062', '-t': 't1'} }
-                - { 'key-args': {'scenario': 'uas-ignore.xml', '-i': '127.0.0.1', '-p': '5063'} }
-
-originator:
-    scenario-trigger-after: '2'
-    channel: 'Local/s at default'
-    async: 'True'
-
-dns-server-config:
-    python-zones:
-        -
-            example.com
-
-properties:
-    minversion: '14.0.0'
-    dependencies:
-        - app : 'sipp'
-        - asterisk : 'res_pjsip'
-        - asterisk : 'res_resolver_unbound'
-    tags:
-        - pjsip
diff --git a/tests/channels/pjsip/resolver/srv/failover/tests.yaml b/tests/channels/pjsip/resolver/srv/failover/tests.yaml
deleted file mode 100644
index 219cb8b..0000000
--- a/tests/channels/pjsip/resolver/srv/failover/tests.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Enter tests here in the order they should be considered for execution:
-tests:
-    - dir: 'in_dialog'
-    - dir: 'out_of_dialog'
diff --git a/tests/channels/pjsip/resolver/srv/failover_udp/configs/ast1/extensions.conf b/tests/channels/pjsip/resolver/srv/failover_udp/configs/ast1/extensions.conf
new file mode 100644
index 0000000..dafe092
--- /dev/null
+++ b/tests/channels/pjsip/resolver/srv/failover_udp/configs/ast1/extensions.conf
@@ -0,0 +1,6 @@
+[default]
+
+exten => s,1,NoOp()
+ same => n,Wait(1)
+ same => n,Dial(PJSIP/jenny/sip:example.com\;transport=udp)
+ same => n,Hangup()
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_udp/configs/ast1/pjsip.conf b/tests/channels/pjsip/resolver/srv/failover_udp/configs/ast1/pjsip.conf
similarity index 100%
rename from tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_udp/configs/ast1/pjsip.conf
rename to tests/channels/pjsip/resolver/srv/failover_udp/configs/ast1/pjsip.conf
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/timeout/configs/ast1/resolver_unbound.conf b/tests/channels/pjsip/resolver/srv/failover_udp/configs/ast1/resolver_unbound.conf
similarity index 100%
rename from tests/channels/pjsip/resolver/srv/failover/in_dialog/timeout/configs/ast1/resolver_unbound.conf
rename to tests/channels/pjsip/resolver/srv/failover_udp/configs/ast1/resolver_unbound.conf
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/dns_zones/example.com b/tests/channels/pjsip/resolver/srv/failover_udp/dns_zones/example.com
similarity index 77%
rename from tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/dns_zones/example.com
rename to tests/channels/pjsip/resolver/srv/failover_udp/dns_zones/example.com
index c0a6669..66f0745 100644
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_unspecified/dns_zones/example.com
+++ b/tests/channels/pjsip/resolver/srv/failover_udp/dns_zones/example.com
@@ -25,9 +25,9 @@
         minimum = "1H"
     ),
 
-    SRV('_sip._udp.example.com', 1, 0, 5063, 'slow.pbx.example.com'),
-    SRV('_sip._tcp.example.com', 0, 0, 5062, 'fast.pbx.example.com'),
-
+    SRV('_sip._udp.example.com', 0, 3, 5061, 'fast.pbx.example.com'),
+    SRV('_sip._udp.example.com', 0, 1, 5062, 'slow.pbx.example.com'),
+    SRV('_sip._udp.example.com', 1, 100, 5063, 'backup.pbx.example.com'),
     A('fast.pbx.example.com', '127.0.0.1'),
     A('slow.pbx.example.com', '127.0.0.1'),
 ]
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_udp/sipp/uas-503.xml b/tests/channels/pjsip/resolver/srv/failover_udp/sipp/uas-503.xml
similarity index 100%
rename from tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_udp/sipp/uas-503.xml
rename to tests/channels/pjsip/resolver/srv/failover_udp/sipp/uas-503.xml
diff --git a/tests/channels/pjsip/resolver/srv/failover_udp/sipp/uas-ignore.xml b/tests/channels/pjsip/resolver/srv/failover_udp/sipp/uas-ignore.xml
new file mode 100644
index 0000000..6645ea6
--- /dev/null
+++ b/tests/channels/pjsip/resolver/srv/failover_udp/sipp/uas-ignore.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<scenario name="Receive INVITE with audio, ignore">
+  <recv request="INVITE" crlf="true">
+  </recv>
+</scenario>
diff --git a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_udp/test-config.yaml b/tests/channels/pjsip/resolver/srv/failover_udp/test-config.yaml
similarity index 71%
rename from tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_udp/test-config.yaml
rename to tests/channels/pjsip/resolver/srv/failover_udp/test-config.yaml
index f7e9c83..9d9e56f 100644
--- a/tests/channels/pjsip/resolver/srv/failover/in_dialog/transport_udp/test-config.yaml
+++ b/tests/channels/pjsip/resolver/srv/failover_udp/test-config.yaml
@@ -1,10 +1,9 @@
 testinfo:
-    summary: 'Test in-dialog SRV failover using a UDP transport'
+    skip: 'See ASTERISK-25076'
+    summary: 'Test SRV failover using a UDP transport'
     description: |
-        Using an in-dialog SIP message (in this case a SIP INVITE) over a UDP
-        transport, this test verifies that an SRV record lookup resulting in
-        multiple results will successfully fail over to other records if
-        previous ones do not respond.
+        This test verifies that an SRV record lookup resulting in multiple results
+        will successfully fail over to other records if previous ones do not respond.
 
 test-modules:
     test-object:
@@ -26,11 +25,15 @@
                 - { 'key-args': {'scenario': 'uas-ignore.xml', '-i': '127.0.0.1', '-p': '5062'} }
 
 originator:
-    scenario-trigger-after: '2'
+    trigger: 'ami_connect'
+    ignore-originate-failure: 'no'
+    id: '0'
     channel: 'Local/s at default'
+    application: 'Echo'
     async: 'True'
 
 dns-server-config:
+    port: 10053
     python-zones:
         -
             example.com
diff --git a/tests/channels/pjsip/resolver/srv/tests.yaml b/tests/channels/pjsip/resolver/srv/tests.yaml
index 2aecba4..06274f0 100644
--- a/tests/channels/pjsip/resolver/srv/tests.yaml
+++ b/tests/channels/pjsip/resolver/srv/tests.yaml
@@ -3,5 +3,5 @@
     - test: 'transport_tcp'
     - test: 'transport_udp'
     - test: 'transport_unspecified'
+    - test: 'failover_udp'
     - test: 'priority'
-    - dir: 'failover'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I20a467ad35caeb4f324ead14f3ae1069668dc22c
Gerrit-PatchSet: 1
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Mark Michelson <mmichelson at digium.com>



More information about the asterisk-code-review mailing list