[asterisk-commits] mnicholson: testsuite/asterisk/trunk r783 - in /asterisk/trunk/tests/cdr/blin...

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Wed Sep  1 11:00:05 2010
New Revision: 783

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=783
Log:
Run asterisk with 'pedantic = no' because sipp can't copy tags around correctly.  Also converted the test to use different local IPs instead of different ports

Modified:
    asterisk/trunk/tests/cdr/blind-transfer-accountcode/configs/sip.conf
    asterisk/trunk/tests/cdr/blind-transfer-accountcode/test.lua

Modified: asterisk/trunk/tests/cdr/blind-transfer-accountcode/configs/sip.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/blind-transfer-accountcode/configs/sip.conf?view=diff&rev=783&r1=782&r2=783
==============================================================================
--- asterisk/trunk/tests/cdr/blind-transfer-accountcode/configs/sip.conf (original)
+++ asterisk/trunk/tests/cdr/blind-transfer-accountcode/configs/sip.conf Wed Sep  1 11:00:05 2010
@@ -1,6 +1,8 @@
 [general]
-udpbindaddr = 127.0.0.1:5060
+udpbindaddr = 127.0.0.1
+bindaddr = 127.0.0.1
 canreinvite = no
+pedantic = no
 
 [test1]
 type = friend

Modified: asterisk/trunk/tests/cdr/blind-transfer-accountcode/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/blind-transfer-accountcode/test.lua?view=diff&rev=783&r1=782&r2=783
==============================================================================
--- asterisk/trunk/tests/cdr/blind-transfer-accountcode/test.lua (original)
+++ asterisk/trunk/tests/cdr/blind-transfer-accountcode/test.lua Wed Sep  1 11:00:05 2010
@@ -14,7 +14,7 @@
 	have_error = true
 end
 
-function sipp_exec(scenario, name, local_port)
+function sipp_exec(scenario, name, host)
 	local inf = "data.csv"
 	return proc.exec_io("sipp",
 	"127.0.0.1",
@@ -22,9 +22,9 @@
 	"-sf", scenario,
 	"-inf", "sipp/" .. inf,
 	"-infindex", inf, "0",
-	"-i", "127.0.0.1",
-	"-p", local_port,
-	"-timeout", "30",
+	"-i", host,
+	"-p", 5060,
+	"-timeout", "60",
 	"-timeout_error",
 	"-set", "user", name,
 	"-set", "file", inf,
@@ -79,14 +79,14 @@
 	a:spawn()
 
 	-- register our three peers
-	sipp_exec_and_wait("sipp/register.xml", index[1], "5061")
-	sipp_exec_and_wait("sipp/register.xml", index[2], "5062")
-	sipp_exec_and_wait("sipp/register.xml", index[3], "5063")
+	sipp_exec_and_wait("sipp/register.xml", index[1], "127.0.0.2")
+	sipp_exec_and_wait("sipp/register.xml", index[2], "127.0.0.3")
+	sipp_exec_and_wait("sipp/register.xml", index[3], "127.0.0.4")
 
 	-- make the calls and transfers
-	local t1 = sipp_exec("sipp/wait-for-call.xml", index[1], "5061")
-	local t2 = sipp_exec("sipp/wait-for-call-do-hangup.xml", index[2], "5062")
-	local t3 = sipp_exec("sipp/call-then-blind-transfer.xml", index[3], "5063")
+	local t1 = sipp_exec("sipp/wait-for-call.xml", index[1], "127.0.0.2")
+	local t2 = sipp_exec("sipp/wait-for-call-do-hangup.xml", index[2], "127.0.0.3")
+	local t3 = sipp_exec("sipp/call-then-blind-transfer.xml", index[3], "127.0.0.4")
 
 	-- wait for everything to finish
 	sipp_check_error(t3, "sipp/call-then-blind-transfer.xml")