From 96353ad9e7e8a6575b3b934dfdd7073e1522c9ef Mon Sep 17 00:00:00 2001
From: Maximilian Fridrich <m.fridrich@commend.com>
Date: Thu, 1 Aug 2024 14:12:46 +0200
Subject: [PATCH] apps/dial/preserve_top: simplify SIPP scenarios to fix
 flakiness

The SIPP scenarios contained stream directions with initial answers
containing audio=inactive for example which are known to trigger
re-INVITEs in Asterisk. The timing of those re-INVITEs is hard to
predict which can make the SIPP scenarios and tests flaky.

Resolves: #60
---
 tests/apps/dial/preserve_top/sipp/alice.xml   | 63 +++++++++++++------
 tests/apps/dial/preserve_top/sipp/bob.xml     | 51 ++++++++-------
 tests/apps/dial/preserve_top/sipp/carol.xml   | 36 +----------
 tests/apps/dial/preserve_top/sipp/carol2.xml  | 38 ++---------
 tests/apps/dial/preserve_top/test-config.yaml |  3 +-
 5 files changed, 80 insertions(+), 111 deletions(-)

diff --git a/tests/apps/dial/preserve_top/sipp/alice.xml b/tests/apps/dial/preserve_top/sipp/alice.xml
index 6d3527eed..2d824844a 100644
--- a/tests/apps/dial/preserve_top/sipp/alice.xml
+++ b/tests/apps/dial/preserve_top/sipp/alice.xml
@@ -21,14 +21,11 @@
       s=-
       c=IN IP[media_ip_type] [media_ip]
       t=0 0
-      m=audio [custom_media_port] RTP/AVP 9 0 8
+      m=audio [custom_media_port] RTP/AVP 0
       a=rtpmap:0 PCMU/8000
-      a=rtpmap:8 PCMA/8000
-      a=rtpmap:9 G722/8000
       a=sendrecv
-      m=video 6000 RTP/AVP 99 34
+      m=video 6000 RTP/AVP 99
       a=rtpmap:99 H264/90000
-      a=rtpmap:34 H263/90000
       a=sendrecv
 
     ]]>
@@ -36,9 +33,7 @@
 
   <recv response="100" optional="true" />
   <recv response="180" />
-
-  <recv response="183" rtd="true">
-  </recv>
+  <recv response="183" optional="true" />
 
   <recv response="200" rtd="true">
     <!-- Save the To tag. -->
@@ -67,23 +62,24 @@
     ]]>
   </send>
 
-  <recv request="INVITE" crlf="true" />
+  <pause milliseconds="100" />
 
   <send retrans="500">
     <![CDATA[
 
-      SIP/2.0 200 OK
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[pid]SIPpTag[call_number]
+      INVITE sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+      [last_Via:]2
+      From: <sip:alice@[local_ip]:[local_port]>;tag=[pid]SIPpTag[call_number]
+      To: <sip:[service]@[remote_ip]:[remote_port]>[$remote_tag]
       [last_Call-ID:]
-      [last_CSeq:]
-      Contact: <sip:bob@[local_ip]:[local_port];transport=[transport]>
+      CSeq: [cseq] INVITE
+      Contact: <sip:alice@[local_ip]:[local_port];transport=[transport]>
+      Max-Forwards: 70
       Content-Type: application/sdp
       Content-Length: [len]
 
       v=0
-      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+      o=- 53655765 2353687637 IN IP[local_ip_type] [local_ip]
       s=-
       c=IN IP[media_ip_type] [media_ip]
       t=0 0
@@ -92,12 +88,43 @@
       a=sendrecv
       m=video 6000 RTP/AVP 99
       a=rtpmap:99 H264/90000
-      a=sendonly
+      a=recvonly
 
     ]]>
   </send>
 
-  <recv request="ACK" crlf="true" />
+  <recv response="200">
+    <action>
+      <ereg regexp="a=sendrecv"
+            search_in="body" check_it="true" assign_to="1"/>
+      <test assign_to="1" variable="1" compare="equal" value=""/>
+      <ereg regexp="a=inactive"
+            search_in="body" check_it_inverse="true" assign_to="2"/>
+      <test assign_to="2" variable="2" compare="equal" value=""/>
+      <ereg regexp="a=sendonly"
+            search_in="body" check_it="true" assign_to="3"/>
+      <test assign_to="3" variable="3" compare="equal" value=""/>
+      <ereg regexp="a=recvonly"
+            search_in="body" check_it_inverse="true" assign_to="4"/>
+      <test assign_to="4" variable="4" compare="equal" value=""/>
+    </action>
+  </recv>
+
+  <send>
+    <![CDATA[
+
+      ACK sip:[service]@[remote_ip]:[remote_port] SIP/2.0
+      [last_Via:]
+      [last_From:]
+      [last_To:]
+      Call-ID: [call_id]
+      CSeq: [cseq] ACK
+      Contact: <sip:alice@[local_ip]:[local_port];transport=[transport]>
+      Max-Forwards: 70
+      Content-Length: 0
+
+    ]]>
+  </send>
 
   <pause milliseconds="2000" />
 
diff --git a/tests/apps/dial/preserve_top/sipp/bob.xml b/tests/apps/dial/preserve_top/sipp/bob.xml
index a7df3c3ee..c5eaac02a 100644
--- a/tests/apps/dial/preserve_top/sipp/bob.xml
+++ b/tests/apps/dial/preserve_top/sipp/bob.xml
@@ -33,7 +33,7 @@
   <send>
     <![CDATA[
 
-      SIP/2.0 183 Progress
+      SIP/2.0 200 OK
       [last_Via:]
       [last_From:]
       [last_To:];tag=[pid]SIPpTag[call_number]
@@ -49,18 +49,36 @@
       c=IN IP[media_ip_type] [media_ip]
       t=0 0
       m=audio [custom_media_port] RTP/AVP 0
-      a=inactive
       a=rtpmap:0 PCMU/8000
+      a=sendrecv
       m=video 6000 RTP/AVP 99
       a=rtpmap:99 H264/90000
-      a=recvonly
+      a=sendrecv
 
     ]]>
   </send>
 
-  <pause milliseconds="200" />
+  <recv request="ACK"
+    rtd="true"
+    crlf="true">
+    <action>
+      <ereg regexp="(.*)"
+          header="To:"
+          search_in="hdr"
+          check_it="true"
+          assign_to="to_h"/>
+      <ereg regexp="(.*)"
+          header="From:"
+          search_in="hdr"
+          check_it="true"
+          assign_to="from_h"/>
+    </action>
+  </recv>
 
-  <send>
+
+  <recv request="INVITE" crlf="true" />
+
+  <send retrans="500">
     <![CDATA[
 
       SIP/2.0 200 OK
@@ -79,31 +97,16 @@
       c=IN IP[media_ip_type] [media_ip]
       t=0 0
       m=audio [custom_media_port] RTP/AVP 0
-      a=inactive
       a=rtpmap:0 PCMU/8000
+      a=sendrecv
       m=video 6000 RTP/AVP 99
       a=rtpmap:99 H264/90000
-      a=recvonly
+      a=sendonly
 
-    ]]>
+   ]]>
   </send>
 
-  <recv request="ACK"
-    rtd="true"
-    crlf="true">
-    <action>
-      <ereg regexp="(.*)"
-          header="To:"
-          search_in="hdr"
-          check_it="true"
-          assign_to="to_h"/>
-      <ereg regexp="(.*)"
-          header="From:"
-          search_in="hdr"
-          check_it="true"
-          assign_to="from_h"/>
-    </action>
-  </recv>
+  <recv request="ACK" crlf="true" />
 
   <pause milliseconds="500" />
 
diff --git a/tests/apps/dial/preserve_top/sipp/carol.xml b/tests/apps/dial/preserve_top/sipp/carol.xml
index 7392aef39..8ad19c499 100644
--- a/tests/apps/dial/preserve_top/sipp/carol.xml
+++ b/tests/apps/dial/preserve_top/sipp/carol.xml
@@ -35,37 +35,7 @@
     ]]>
   </send>
 
-  <pause milliseconds="100" />
-
-  <send>
-    <![CDATA[
-
-      SIP/2.0 183 Progress
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[pid]SIPpTag[call_number]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: <sip:bob@[local_ip]:[local_port];transport=[transport]>
-      Content-Type: application/sdp
-      Content-Length: [len]
-
-      v=0
-      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
-      s=-
-      c=IN IP[media_ip_type] [media_ip]
-      t=0 0
-      m=audio [custom_media_port] RTP/AVP 0
-      a=rtpmap:0 PCMU/8000
-      a=inactive
-      m=video 6000 RTP/AVP 99
-      a=rtpmap:99 H264/90000
-      a=recvonly
-
-    ]]>
-  </send>
-
-  <pause milliseconds="100" />
+  <pause milliseconds="200" />
 
   <send retrans="500">
     <![CDATA[
@@ -87,10 +57,10 @@
       t=0 0
       m=audio [custom_media_port] RTP/AVP 0
       a=rtpmap:0 PCMU/8000
-      a=inactive
+      a=sendrecv
       m=video 6000 RTP/AVP 99
       a=rtpmap:99 H264/90000
-      a=recvonly
+      a=sendonly
 
     ]]>
   </send>
diff --git a/tests/apps/dial/preserve_top/sipp/carol2.xml b/tests/apps/dial/preserve_top/sipp/carol2.xml
index 3b9a44950..5dca9a6dd 100644
--- a/tests/apps/dial/preserve_top/sipp/carol2.xml
+++ b/tests/apps/dial/preserve_top/sipp/carol2.xml
@@ -12,10 +12,10 @@
             search_in="body" check_it_inverse="true" assign_to="2"/>
       <test assign_to="2" variable="2" compare="equal" value=""/>
       <ereg regexp="a=sendonly"
-            search_in="body" check_it="true" assign_to="3"/>
+            search_in="body" check_it_inverse="true" assign_to="3"/>
       <test assign_to="3" variable="3" compare="equal" value=""/>
       <ereg regexp="a=recvonly"
-            search_in="body" check_it_inverse="true" assign_to="4"/>
+            search_in="body" check_it="true" assign_to="4"/>
       <test assign_to="4" variable="4" compare="equal" value=""/>
     </action>
   </recv>
@@ -37,36 +37,6 @@
 
   <pause milliseconds="200" />
 
-  <send>
-    <![CDATA[
-
-      SIP/2.0 183 Progress
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[pid]SIPpTag[call_number]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: <sip:bob@[local_ip]:[local_port];transport=[transport]>
-      Content-Type: application/sdp
-      Content-Length: [len]
-
-      v=0
-      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
-      s=-
-      c=IN IP[media_ip_type] [media_ip]
-      t=0 0
-      m=audio [custom_media_port] RTP/AVP 0
-      a=rtpmap:0 PCMU/8000
-      a=inactive
-      m=video 6000 RTP/AVP 99
-      a=rtpmap:99 H264/90000
-      a=recvonly
-
-    ]]>
-  </send>
-
-  <pause milliseconds="200" />
-
   <send retrans="500">
     <![CDATA[
 
@@ -87,10 +57,10 @@
       t=0 0
       m=audio [custom_media_port] RTP/AVP 0
       a=rtpmap:0 PCMU/8000
-      a=inactive
+      a=sendrecv
       m=video 6000 RTP/AVP 99
       a=rtpmap:99 H264/90000
-      a=recvonly
+      a=sendonly
 
     ]]>
   </send>
diff --git a/tests/apps/dial/preserve_top/test-config.yaml b/tests/apps/dial/preserve_top/test-config.yaml
index 9b97b3a51..d9e1f9177 100644
--- a/tests/apps/dial/preserve_top/test-config.yaml
+++ b/tests/apps/dial/preserve_top/test-config.yaml
@@ -1,8 +1,7 @@
 ---
 testinfo:
     summary: |
-        'Test the Dial option "j" which preserver the initial topology of the caller.'
-    skip: 'The middle sipp scenario fails often.  See https://github.com/asterisk/testsuite/issues/60'
+        'Test the Dial option "j" which preserves the initial topology of the caller.'
     description: |
         'Alice calls Bob whose 200 SDP answer contains an audio stream and a
         video stream which is set to recvonly. Bob hangs up and then the Dial