[asterisk-commits] mmichelson: branch mmichelson/queue_tests r218 - in /asterisk/team/mmichelson...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Apr  8 16:45:25 2010
New Revision: 218

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=218
Log:
There's no reason for the baseline test to require sipp. Remove dependency.


Modified:
    asterisk/team/mmichelson/queue_tests/tests/queues/queue_baseline/configs/extensions.conf
    asterisk/team/mmichelson/queue_tests/tests/queues/queue_baseline/configs/queues.conf
    asterisk/team/mmichelson/queue_tests/tests/queues/queue_baseline/test-config.yaml
    asterisk/team/mmichelson/queue_tests/tests/queues/queue_baseline/test.lua

Modified: asterisk/team/mmichelson/queue_tests/tests/queues/queue_baseline/configs/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mmichelson/queue_tests/tests/queues/queue_baseline/configs/extensions.conf?view=diff&rev=218&r1=217&r2=218
==============================================================================
--- asterisk/team/mmichelson/queue_tests/tests/queues/queue_baseline/configs/extensions.conf (original)
+++ asterisk/team/mmichelson/queue_tests/tests/queues/queue_baseline/configs/extensions.conf Thu Apr  8 16:45:25 2010
@@ -6,3 +6,7 @@
 
 exten => queue,1,Queue(test_queue)
 exten => queue,n,Hangup
+
+exten => member,1,Answer
+exten => member,n,Wait(2)
+exten => member,n,Hangup

Modified: asterisk/team/mmichelson/queue_tests/tests/queues/queue_baseline/configs/queues.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mmichelson/queue_tests/tests/queues/queue_baseline/configs/queues.conf?view=diff&rev=218&r1=217&r2=218
==============================================================================
--- asterisk/team/mmichelson/queue_tests/tests/queues/queue_baseline/configs/queues.conf (original)
+++ asterisk/team/mmichelson/queue_tests/tests/queues/queue_baseline/configs/queues.conf Thu Apr  8 16:45:25 2010
@@ -2,4 +2,4 @@
 
 [test_queue]
 eventwhencalled = yes
-member => SIP/peer
+member => Local/member at test_context

Modified: asterisk/team/mmichelson/queue_tests/tests/queues/queue_baseline/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mmichelson/queue_tests/tests/queues/queue_baseline/test-config.yaml?view=diff&rev=218&r1=217&r2=218
==============================================================================
--- asterisk/team/mmichelson/queue_tests/tests/queues/queue_baseline/test-config.yaml (original)
+++ asterisk/team/mmichelson/queue_tests/tests/queues/queue_baseline/test-config.yaml Thu Apr  8 16:45:25 2010
@@ -9,4 +9,3 @@
     minversion: '1.4'
     dependencies:
         - app: 'asttest'
-        - app: 'sipp'

Modified: asterisk/team/mmichelson/queue_tests/tests/queues/queue_baseline/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mmichelson/queue_tests/tests/queues/queue_baseline/test.lua?view=diff&rev=218&r1=217&r2=218
==============================================================================
--- asterisk/team/mmichelson/queue_tests/tests/queues/queue_baseline/test.lua (original)
+++ asterisk/team/mmichelson/queue_tests/tests/queues/queue_baseline/test.lua Thu Apr  8 16:45:25 2010
@@ -1,39 +1,3 @@
-function sipp_exec(scenario, local_port)
-	return proc.exec_io("sipp",
-	"127.0.0.1",
-	"-m", "1",
-	"-sf", scenario,
-	"-i", "127.0.0.1",
-	"-p", local_port,
-	"-timeout", "30",
-	"-trace_err"
-	)
-end
-
-function sipp_exec_and_wait(scenario, name, local_port)
-	return sipp_check_error(sipp_exec(scenario, name, local_port), scenario)
-end
-
-function sipp_check_error(p, scenario)
-	local res, err = p:wait()
-
-	if not res then error(err) end
-	if res ~= 0 then
-		error("error while executing " .. scenario .. " sipp scenario (sipp exited with status " .. res .. ")\n" .. p.stderr:read("*a"))
-	end
-
-	return res, err
-end
-
-function setup_uas()
-	local t1 = sipp_exec("sipp/uas.xml", "5061")
-	return t1
-end
-
-function kill_uas(t1)
-	t1:term_or_kill()
-end
-
 function manager_setup(a)
 	local m,err = a:manager_connect()
 	if not m then
@@ -82,7 +46,6 @@
 end
 
 function do_call(man)
-	local uas = setup_uas()
 	local orig = ast.manager.action:new("Originate")
 	orig["Channel"] = "Local/test at test_context"
 	orig["Exten"] = "queue"
@@ -111,7 +74,6 @@
 	man:unregister_event("AgentConnect", connect_event)
 	man:unregister_event("Leave", leave_event)
 	man:unregister_event("AgentComplete", complete_event)
-	kill_uas(uas)
 end
 
 instance = ast.new()