[asterisk-commits] mmichelson: testsuite/asterisk/trunk r361 - in /asterisk/trunk/tests/queues: ...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Jun 7 13:38:36 CDT 2010
Author: mmichelson
Date: Mon Jun 7 13:38:33 2010
New Revision: 361
URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=361
Log:
Remove wait_until_booted functions from queue tests.
These aren't needed anymore since asttest now will wait for this
event automatically when spawning an Asterisk process.
Modified:
asterisk/trunk/tests/queues/macro_gosub_test/test.lua
asterisk/trunk/tests/queues/position_priority_maxlen/test.lua
asterisk/trunk/tests/queues/queue_baseline/test.lua
asterisk/trunk/tests/queues/ringinuse_and_pause/test.lua
asterisk/trunk/tests/queues/wrapup_time/test.lua
Modified: asterisk/trunk/tests/queues/macro_gosub_test/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/queues/macro_gosub_test/test.lua?view=diff&rev=361&r1=360&r2=361
==============================================================================
--- asterisk/trunk/tests/queues/macro_gosub_test/test.lua (original)
+++ asterisk/trunk/tests/queues/macro_gosub_test/test.lua Mon Jun 7 13:38:33 2010
@@ -18,23 +18,6 @@
fail("error authenticating: " .. r["Message"])
end
return m
-end
-
-booted = nil
-function boot_event(event)
- booted = true
-end
-
-function wait_until_booted(man)
- man:register_event("FullyBooted", boot_event)
- while not booted do
- local res, err = man:wait_event()
- if not res then
- fail("Failure while waiting for FullyBooted event: " .. err)
- end
- man:process_events()
- end
- man:unregister_event("FullyBooted", boot_event)
end
function primary(event)
@@ -111,8 +94,6 @@
man = manager_setup(instance)
-wait_until_booted(man)
-
test_call("test1", man, primary)
test_call("test2", man, secondary)
Modified: asterisk/trunk/tests/queues/position_priority_maxlen/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/queues/position_priority_maxlen/test.lua?view=diff&rev=361&r1=360&r2=361
==============================================================================
--- asterisk/trunk/tests/queues/position_priority_maxlen/test.lua (original)
+++ asterisk/trunk/tests/queues/position_priority_maxlen/test.lua Mon Jun 7 13:38:33 2010
@@ -27,23 +27,6 @@
instance:generate_manager_conf()
instance:spawn()
return instance
-end
-
-booted = nil
-function boot_event(event)
- booted = true
-end
-
-function wait_until_booted(man)
- man:register_event("FullyBooted", boot_event)
- while not booted do
- local res, err = man:wait_event()
- if not res then
- fail("Failure while waiting for FullyBooted event: " .. err)
- end
- man:process_events()
- end
- man:unregister_event("FullyBooted", boot_event)
end
function join_event(event)
@@ -92,7 +75,6 @@
instance = setup_ast_instance()
man = manager_setup(instance)
-wait_until_booted(man)
test_call(nil, nil, 1) --1
test_call(nil, nil, 2) --1,2
test_call(1, nil, 1) --3,1,2
Modified: asterisk/trunk/tests/queues/queue_baseline/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/queues/queue_baseline/test.lua?view=diff&rev=361&r1=360&r2=361
==============================================================================
--- asterisk/trunk/tests/queues/queue_baseline/test.lua (original)
+++ asterisk/trunk/tests/queues/queue_baseline/test.lua Mon Jun 7 13:38:33 2010
@@ -18,23 +18,6 @@
fail("error authenticating: " .. r["Message"])
end
return m
-end
-
-booted = nil
-function boot_event(event)
- booted = true
-end
-
-function wait_until_booted(man)
- man:register_event("FullyBooted", boot_event)
- while not booted do
- local res, err = man:wait_event()
- if not res then
- fail("Failure while waiting for FullyBooted event: " .. err)
- end
- man:process_events()
- end
- man:unregister_event("FullyBooted", boot_event)
end
join = nil
@@ -101,8 +84,6 @@
man = manager_setup(instance)
-wait_until_booted(man)
-
do_call(man)
logoff = ast.manager.action.logoff()
man(logoff)
Modified: asterisk/trunk/tests/queues/ringinuse_and_pause/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/queues/ringinuse_and_pause/test.lua?view=diff&rev=361&r1=360&r2=361
==============================================================================
--- asterisk/trunk/tests/queues/ringinuse_and_pause/test.lua (original)
+++ asterisk/trunk/tests/queues/ringinuse_and_pause/test.lua Mon Jun 7 13:38:33 2010
@@ -56,23 +56,6 @@
instance:generate_manager_conf()
instance:spawn()
return instance
-end
-
-booted = nil
-function boot_event(event)
- booted = true
-end
-
-function wait_until_booted(man)
- man:register_event("FullyBooted", boot_event)
- while not booted do
- local res, err = man:wait_event()
- if not res then
- fail("Failure while waiting for FullyBooted event: " .. err)
- end
- man:process_events()
- end
- man:unregister_event("FullyBooted", boot_event)
end
function get_chan_name(event)
@@ -155,7 +138,6 @@
sipp_proc = sipp_exec("sipp/uas.xml", "5061")
a = setup_ast_instance()
man = manager_setup(a)
-wait_until_booted(man)
chan_name = nil
busy_the_member(man)
Modified: asterisk/trunk/tests/queues/wrapup_time/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/queues/wrapup_time/test.lua?view=diff&rev=361&r1=360&r2=361
==============================================================================
--- asterisk/trunk/tests/queues/wrapup_time/test.lua (original)
+++ asterisk/trunk/tests/queues/wrapup_time/test.lua Mon Jun 7 13:38:33 2010
@@ -18,23 +18,6 @@
fail("error authenticating: " .. r["Message"])
end
return m
-end
-
-booted = nil
-function boot_event(event)
- booted = true
-end
-
-function wait_until_booted(man)
- man:register_event("FullyBooted", boot_event)
- while not booted do
- local res, err = man:wait_event()
- if not res then
- fail("Failure while waiting for FullyBooted event: " .. err)
- end
- man:process_events()
- end
- man:unregister_event("FullyBooted", boot_event)
end
function member1(event)
@@ -135,9 +118,6 @@
man1 = manager_setup(instance1)
man2 = manager_setup(instance2)
-wait_until_booted(man1)
-wait_until_booted(man2)
-
test_call(instance1, man1, member1, "test1")
test_call(instance1, man1, member1, "test2")
test_call(instance1, man1, member2, "test1")
More information about the asterisk-commits
mailing list