[Asterisk-code-review] custom_info: Fix duplicated scenario files for SIP INFO message tests (testsuite[master])

Friendly Automation asteriskteam at digium.com
Mon Jan 20 09:32:33 CST 2020


Friendly Automation has submitted this change. ( https://gerrit.asterisk.org/c/testsuite/+/13646 )

Change subject: custom_info: Fix duplicated scenario files for SIP INFO message tests
......................................................................

custom_info: Fix duplicated scenario files for SIP INFO message tests

Change-Id: Iac3bf586b574dea5523479e8ecb5313c3de42042
---
M tests/channels/SIP/custom_info/sipp/excluded_useragent.xml
M tests/channels/SIP/custom_info/sipp/selected_useragent.xml
M tests/channels/SIP/custom_info/sipp/send_all.xml
3 files changed, 0 insertions(+), 319 deletions(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  Friendly Automation: Approved for Submit



diff --git a/tests/channels/SIP/custom_info/sipp/excluded_useragent.xml b/tests/channels/SIP/custom_info/sipp/excluded_useragent.xml
index 2f02034..aa3a58e 100644
--- a/tests/channels/SIP/custom_info/sipp/excluded_useragent.xml
+++ b/tests/channels/SIP/custom_info/sipp/excluded_useragent.xml
@@ -85,92 +85,3 @@
   <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
 
 </scenario>
-
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Channel Test">
-  <send retrans="500">
-    <![CDATA[
-
-      INVITE sip:test2@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: guest <sip:guest@[local_ip]:[local_port]>;tag=[call_number]
-      To: kartoffelsalat <sip:kartoffelsalat@[remote_ip]:[remote_port]>
-      Call-ID: [call_id]
-      CSeq: 1 INVITE
-      Contact: sip:kartoffelsalat@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: Performance Test
-      User-Agent: excludedUA
-      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 6000 RTP/AVP 0 101
-      a=rtpmap:0 PCMU/8000
-      a=rtpmap:101 telephone-event/8000
-
-    ]]>
-  </send>
-
-  <recv response="100" optional="true">
-  </recv>
-
-  <recv response="180" optional="true">
-  </recv>
-
-  <recv response="183" optional="true">
-  </recv>
-
-  <recv response="200" rtd="true">
-  </recv>
-
-  <send>
-    <![CDATA[
-
-      ACK sip:test@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: test1 <sip:guest0@[local_ip]:[local_port]>;tag=[call_number]
-      To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 1 ACK
-      Contact: sip:kartoffelsalat@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: Performance Test
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <recv request="BYE"/>
-
-  <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:kartoffelsalat@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: Performance Test
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <!-- definition of the response time repartition table (unit is ms)   -->
-  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
-  <!-- definition of the call length repartition table (unit is ms)     -->
-  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
-</scenario>
-
diff --git a/tests/channels/SIP/custom_info/sipp/selected_useragent.xml b/tests/channels/SIP/custom_info/sipp/selected_useragent.xml
index c7c7e7c..823cc62 100644
--- a/tests/channels/SIP/custom_info/sipp/selected_useragent.xml
+++ b/tests/channels/SIP/custom_info/sipp/selected_useragent.xml
@@ -111,118 +111,3 @@
   <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
 
 </scenario>
-
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Channel Test">
-  <send retrans="500">
-    <![CDATA[
-
-      INVITE sip:test2@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: guest <sip:guest@[local_ip]:[local_port]>;tag=[call_number]
-      To: kartoffelsalat <sip:kartoffelsalat@[remote_ip]:[remote_port]>
-      Call-ID: [call_id]
-      CSeq: 1 INVITE
-      Contact: sip:kartoffelsalat@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: Performance Test
-      User-Agent: specificUA
-      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 6000 RTP/AVP 0 101
-      a=rtpmap:0 PCMU/8000
-      a=rtpmap:101 telephone-event/8000
-
-    ]]>
-  </send>
-
-  <recv response="100" optional="true">
-  </recv>
-
-  <recv response="180" optional="true">
-  </recv>
-
-  <recv response="183" optional="true">
-  </recv>
-
-  <recv response="200" rtd="true">
-  </recv>
-
-  <send>
-    <![CDATA[
-
-      ACK sip:test@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: test1 <sip:guest0@[local_ip]:[local_port]>;tag=[call_number]
-      To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 1 ACK
-      Contact: sip:kartoffelsalat@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: Performance Test
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <recv request="INFO" rtd="true">
-    <action>
-      <!-- make sure the body has the text we expect -->
-      <ereg regexp="sent to certain UAs"
-            search_in="body" check_it="true" assign_to="1"/>
-      <strcmp assign_to="1" variable="1" value=""/>
-    </action>
-  </recv>
-
-  <send>
-    <![CDATA[
-
-      SIP/2.0 200 OK
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[pid]SIPpTag01[call_number]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: sip:kartoffelsalat@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: Performance Test
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <recv request="BYE"/>
-
-  <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:kartoffelsalat@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: Performance Test
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <!-- definition of the response time repartition table (unit is ms)   -->
-  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
-  <!-- definition of the call length repartition table (unit is ms)     -->
-  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
-</scenario>
-
diff --git a/tests/channels/SIP/custom_info/sipp/send_all.xml b/tests/channels/SIP/custom_info/sipp/send_all.xml
index 1e44620..4fd1256 100644
--- a/tests/channels/SIP/custom_info/sipp/send_all.xml
+++ b/tests/channels/SIP/custom_info/sipp/send_all.xml
@@ -111,118 +111,3 @@
   <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
 
 </scenario>
-
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Channel Test">
-  <send retrans="500">
-    <![CDATA[
-
-      INVITE sip:test1@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: guest <sip:guest@[local_ip]:[local_port]>;tag=[call_number]
-      To: kartoffelsalat <sip:kartoffelsalat@[remote_ip]:[remote_port]>
-      Call-ID: [call_id]
-      CSeq: 1 INVITE
-      Contact: sip:kartoffelsalat@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: Performance Test
-      User-Agent: specificUA
-      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 6000 RTP/AVP 0 101
-      a=rtpmap:0 PCMU/8000
-      a=rtpmap:101 telephone-event/8000
-
-    ]]>
-  </send>
-
-  <recv response="100" optional="true">
-  </recv>
-
-  <recv response="180" optional="true">
-  </recv>
-
-  <recv response="183" optional="true">
-  </recv>
-
-  <recv response="200" rtd="true">
-  </recv>
-
-  <send>
-    <![CDATA[
-
-      ACK sip:test@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: test1 <sip:guest0@[local_ip]:[local_port]>;tag=[call_number]
-      To: test <sip:test@[remote_ip]:[remote_port]>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 1 ACK
-      Contact: sip:kartoffelsalat@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: Performance Test
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <recv request="INFO" rtd="true">
-    <action>
-      <!-- make sure the body has the text we expect -->
-      <ereg regexp="sent to everyone"
-            search_in="body" check_it="true" assign_to="1"/>
-      <strcmp assign_to="1" variable="1" value=""/>
-    </action>
-  </recv>
-
-  <send>
-    <![CDATA[
-
-      SIP/2.0 200 OK
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[pid]SIPpTag01[call_number]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: sip:kartoffelsalat@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: Performance Test
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <recv request="BYE"/>
-
-  <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:kartoffelsalat@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: Performance Test
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <!-- definition of the response time repartition table (unit is ms)   -->
-  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-
-  <!-- definition of the call length repartition table (unit is ms)     -->
-  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-
-</scenario>
-

-- 
To view, visit https://gerrit.asterisk.org/c/testsuite/+/13646
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Change-Id: Iac3bf586b574dea5523479e8ecb5313c3de42042
Gerrit-Change-Number: 13646
Gerrit-PatchSet: 1
Gerrit-Owner: Sean Bright <sean.bright at gmail.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at sangoma.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20200120/faf7c47d/attachment-0001.html>


More information about the asterisk-code-review mailing list