From f6745fdbcbc925e768c1a25d520828218569a6c7 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Thu, 12 Jun 2014 09:14:16 +0200 Subject: [PATCH] MT#7423 trying to deal with sems 1.6 different behaviour --- scenarios/invite_callforward/0011_test.yml.tt2 | 12 ++++++------ scenarios/invite_callforward/0018_test.yml.tt2 | 8 ++++---- scenarios/invite_callforward/0029_test.yml.tt2 | 12 ++++++------ .../invite_concurrent_max_out/0014_test.yml.tt2 | 2 +- scenarios/invite_redirect/0007_test.yml.tt2 | 4 ++-- scenarios/invite_speeddial/0007_test.yml.tt2 | 4 ++-- scenarios/invite_speeddial/0016_test.yml.tt2 | 4 ++-- scenarios/invite_tcp_udp_reinvite/0010_test.yml.tt2 | 2 +- scenarios/invite_voicebox/0005_test.yml.tt2 | 6 +++--- scenarios/invite_voicebox/0010_test.yml.tt2 | 5 ++--- scenarios/invite_voicebox/0011_test.yml.tt2 | 4 ++-- 11 files changed, 31 insertions(+), 32 deletions(-) diff --git a/scenarios/invite_callforward/0011_test.yml.tt2 b/scenarios/invite_callforward/0011_test.yml.tt2 index 29e2ea80..ee93c429 100644 --- a/scenarios/invite_callforward/0011_test.yml.tt2 +++ b/scenarios/invite_callforward/0011_test.yml.tt2 @@ -87,7 +87,7 @@ flow: - exit|REPLY_ROUTE_NAT: sip_in: - '^INVITE sip:4311003@' - - 'Contact: ' + - 'Contact: ', + 'Contact: ', 'To: ', ] - [ '^SIP/2.0 180 Ringing', 'CSeq: 2 INVITE', 'From: ', ] - [ '^SIP/2.0 200 OK', 'CSeq: 10 INVITE', 'From: ', 'Content-Type: application/sdp' ] - [ @@ -146,6 +146,6 @@ sip_out: 'CSeq: 2 INVITE', 'From: ', 'Content-Type: application/sdp' ] diff --git a/scenarios/invite_callforward/0018_test.yml.tt2 b/scenarios/invite_callforward/0018_test.yml.tt2 index e3fdfae4..b02361f2 100644 --- a/scenarios/invite_callforward/0018_test.yml.tt2 +++ b/scenarios/invite_callforward/0018_test.yml.tt2 @@ -6,16 +6,16 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_OUTBOUND: sip_in: - - '^ACK sip:testuser1003@127.0.0.1:5080 SIP/2.0' - - 'Contact: ' + - '^ACK sip:(testuser1003@)?127.0.0.1:5080(;transport=udp)? SIP/2.0' + - 'Contact: ' - 'CSeq: 10 ACK' - 'Content-Length: 0' - 'From: ', + '^ACK sip:(testuser1003@)?127.0.0.1:5080(;transport=udp)? SIP/2.0', + 'Contact: ', 'CSeq: 10 ACK', 'Content-Length: 0', 'From: ' + - 'Contact: ' - 'CSeq: 10 INVITE' - 'Content-Type: application/sdp' - 'P-Caller-UUID: \w+' @@ -113,7 +113,7 @@ sip_out: '^INVITE sip:testuser1005@', 'CSeq: 10 INVITE', 'From: ', + 'Contact: ', 'To: ' ] - [ '^SIP/2.0 180 Ringing', 'CSeq: 2 INVITE', 'From: ' ] - [ '^SIP/2.0 200 OK', 'CSeq: 10 INVITE', 'From: ', 'Content-Type: application/sdp' ] - [ @@ -150,6 +150,6 @@ sip_out: 'CSeq: 2 INVITE', 'From: ', 'Content-Type: application/sdp' ] diff --git a/scenarios/invite_concurrent_max_out/0014_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0014_test.yml.tt2 index 606b9901..bef0b8e5 100644 --- a/scenarios/invite_concurrent_max_out/0014_test.yml.tt2 +++ b/scenarios/invite_concurrent_max_out/0014_test.yml.tt2 @@ -40,7 +40,7 @@ sip_out: 'From: ', + 'Contact: ', 'Content-Type: application/sdp', 'a=recvonly' ] diff --git a/scenarios/invite_redirect/0007_test.yml.tt2 b/scenarios/invite_redirect/0007_test.yml.tt2 index ea03dad9..e15f571b 100644 --- a/scenarios/invite_redirect/0007_test.yml.tt2 +++ b/scenarios/invite_redirect/0007_test.yml.tt2 @@ -224,7 +224,7 @@ sip_out: 'From: ', 'Content-Length: 0' ] - [ @@ -232,6 +232,6 @@ sip_out: 'From: ', 'Content-Type: application/sdp' ] diff --git a/scenarios/invite_speeddial/0007_test.yml.tt2 b/scenarios/invite_speeddial/0007_test.yml.tt2 index 6dba68c9..f3d2e748 100644 --- a/scenarios/invite_speeddial/0007_test.yml.tt2 +++ b/scenarios/invite_speeddial/0007_test.yml.tt2 @@ -128,7 +128,7 @@ sip_out: ] - [ '^SIP/2.0 180 Ringing', - 'Contact: ', 'CSeq: 2 INVITE', 'Content-Length: 0', 'From: ', 'CSeq: 2 INVITE', 'From: ' - 'CSeq: 10 INVITE' - 'Content-Type: application/sdp' sip_out: diff --git a/scenarios/invite_voicebox/0005_test.yml.tt2 b/scenarios/invite_voicebox/0005_test.yml.tt2 index dc12082c..88ebb389 100644 --- a/scenarios/invite_voicebox/0005_test.yml.tt2 +++ b/scenarios/invite_voicebox/0005_test.yml.tt2 @@ -64,7 +64,7 @@ flow: - exit|REPLY_ROUTE_NAT: sip_in: - '^INVITE sip:vmu4311001@voicebox.local SIP/2.0' - - 'Contact: ' + - 'Contact: ' - 'CSeq: 10 INVITE' - 'Content-Type: application/sdp' - 'P-Caller-UUID: \w+' @@ -84,7 +84,7 @@ sip_out: 'CSeq: 10 INVITE', 'From: ', + 'Contact: ', 'Content-Type: application/sdp' ] - [ @@ -101,6 +101,6 @@ sip_out: 'CSeq: 2 INVITE', 'From: ', + 'Contact: ', 'Content-Type: application/sdp' ] diff --git a/scenarios/invite_voicebox/0010_test.yml.tt2 b/scenarios/invite_voicebox/0010_test.yml.tt2 index 9fed24d1..e3c970e9 100644 --- a/scenarios/invite_voicebox/0010_test.yml.tt2 +++ b/scenarios/invite_voicebox/0010_test.yml.tt2 @@ -7,7 +7,7 @@ flow: - start|ROUTE_OUTBOUND: sip_in: - '^ACK sip:vmu4311001@127.0.0.1:5070 SIP/2.0' - - 'Contact: ' + - 'Contact: ' - 'CSeq: 10 ACK' - 'Content-Length: 0' - 'From: ', + 'Contact: ', 'CSeq: 10 ACK', - 'Max-Forwards: 70', 'Content-Length: 0', 'From: