[asterisk-commits] tilghman: branch tilghman/callparking_retrieval r824 - in /asterisk/team/tilg...

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Nov 10 16:05:05 2010
New Revision: 824

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=824
Log:
Merging forward, so I can merge back.

Modified:
    asterisk/team/tilghman/callparking_retrieval/   (props changed)
    asterisk/team/tilghman/callparking_retrieval/asttest/lib/lua/astlib.lua
    asterisk/team/tilghman/callparking_retrieval/asttest/self-tests/asterisk_cli/test.lua
    asterisk/team/tilghman/callparking_retrieval/asttest/self-tests/spawn_asterisk/test.lua
    asterisk/team/tilghman/callparking_retrieval/tests/tests.yaml

Propchange: asterisk/team/tilghman/callparking_retrieval/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Nov 10 16:05:05 2010
@@ -1,1 +1,1 @@
-/asterisk/trunk:1-802
+/asterisk/trunk:1-823

Modified: asterisk/team/tilghman/callparking_retrieval/asttest/lib/lua/astlib.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/tilghman/callparking_retrieval/asttest/lib/lua/astlib.lua?view=diff&rev=824&r1=823&r2=824
==============================================================================
--- asterisk/team/tilghman/callparking_retrieval/asttest/lib/lua/astlib.lua (original)
+++ asterisk/team/tilghman/callparking_retrieval/asttest/lib/lua/astlib.lua Wed Nov 10 16:05:05 2010
@@ -109,6 +109,14 @@
 	local res, err = p:wait(300000)
 	if not res then
 		return res, err
+	end
+
+	if res ~= 0 then
+		local output = p.stdout:read("*a")
+		if not output then
+			return nil, "error connecting to asterisk cli"
+		end
+		return nil, output
 	end
 
 	return p.stdout:read("*a")
@@ -125,26 +133,24 @@
 	for _=1,10 do
 		local err
 		booted, err = self:cli("core waitfullybooted")
-		if not booted then
-			if err then
-				error("error waiting for asterisk to fully boot: " .. err)
-			else
-				error("error waiting for asterisk to fully boot")
-			end
-		end
-
+		
 		if #output ~= 0 then
 			output = output .. "=====\n"
 		end
 
-		output = output .. booted
-
-		if booted:find("fully booted") then
-			break
-		end
+		if booted then
+			output = output .. booted
+
+			if booted:find("fully booted") then
+				break
+			end
+		else
+			output = output .. err
+		end
+
 		posix.usleep(500000)
 	end
-	if not booted:find("fully booted") then
+	if booted and not booted:find("fully booted") then
 		print("error waiting for asterisk to fully boot: " .. booted)
 		print("checking to see if asterisk is still running")
 		local res, err = proc.perror(self:wait(1000))

Modified: asterisk/team/tilghman/callparking_retrieval/asttest/self-tests/asterisk_cli/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/tilghman/callparking_retrieval/asttest/self-tests/asterisk_cli/test.lua?view=diff&rev=824&r1=823&r2=824
==============================================================================
--- asterisk/team/tilghman/callparking_retrieval/asttest/self-tests/asterisk_cli/test.lua (original)
+++ asterisk/team/tilghman/callparking_retrieval/asttest/self-tests/asterisk_cli/test.lua Wed Nov 10 16:05:05 2010
@@ -5,8 +5,8 @@
 a = ast.new()
 a:spawn()
 
-version = a:cli("core show version")
-fail_if(not version, "error running asterisk -rx 'core show version' or error reading the output of asterisk -rx 'core show version'")
+version, err = a:cli("core show version")
+fail_if(not version, "error running asterisk -rx 'core show version': " .. tostring(err))
 print(version)
 
 res, err = proc.perror(a:term_or_kill())
@@ -17,5 +17,7 @@
 	fail("error, asterisk exited with status " .. res)
 end
 
+fail_if(a:cli("core show version"), "some how 'core show version' succeeded when asterisk was not running")
+
 pass("asterisk exited with status " .. res)
 

Modified: asterisk/team/tilghman/callparking_retrieval/asttest/self-tests/spawn_asterisk/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/tilghman/callparking_retrieval/asttest/self-tests/spawn_asterisk/test.lua?view=diff&rev=824&r1=823&r2=824
==============================================================================
--- asterisk/team/tilghman/callparking_retrieval/asttest/self-tests/spawn_asterisk/test.lua (original)
+++ asterisk/team/tilghman/callparking_retrieval/asttest/self-tests/spawn_asterisk/test.lua Wed Nov 10 16:05:05 2010
@@ -2,15 +2,16 @@
 
 skip_if(not ast.exists(), "asterisk not found")
 
+count = 5
 instances = {}
-for i=1,10 do
+for i=1,count do
 	print("starting asterisk instance " .. i)
 	local a = ast.new()
 	a:spawn()
 	table.insert(instances, a)
 end
 
-for i=1,10 do
+for i=1,count do
 	print("killing asterisk instance " .. i)
 	local a = instances[i]
 	local res, err = proc.perror(a:term_or_kill())

Modified: asterisk/team/tilghman/callparking_retrieval/tests/tests.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/tilghman/callparking_retrieval/tests/tests.yaml?view=diff&rev=824&r1=823&r2=824
==============================================================================
--- asterisk/team/tilghman/callparking_retrieval/tests/tests.yaml (original)
+++ asterisk/team/tilghman/callparking_retrieval/tests/tests.yaml Wed Nov 10 16:05:05 2010
@@ -24,15 +24,19 @@
     - test: 'sip_outbound_address'
     - test: 'sip_attended_transfer'
     - test: 'sip_attended_transfer_tcp'
-    - test: 'sip_attended_transfer_v6'
+    # Temporarily disabled while failures are debugged
+    #- test: 'sip_attended_transfer_v6'
     - test: 'sip_one_legged_transfer'
-    - test: 'sip_one_legged_transfer_v6'
+    # Temporarily disabled while failures are debugged
+    #- test: 'sip_one_legged_transfer_v6'
     - test: 'sip_register'
     - test: 'sip/handle_response_refer'
     - test: 'udptl'
     - test: 'udptl_v6'
-    - test: 'feature_blonde_transfer'
-    - test: 'feature_attended_transfer'
+    # Temporarily disabled while failures are debugged
+    #- test: 'feature_blonde_transfer'
+    # Temporarily disabled while failures are debugged
+    #- test: 'feature_attended_transfer'
     - test: 'blind-transfer-parkingtimeout'
     - test: 'one-step-parking'
     - test: 'callparking'
@@ -43,8 +47,10 @@
     - test: 'queues/queue_baseline'
     - test: 'queues/position_priority_maxlen'
     - test: 'queues/macro_gosub_test'
-    - test: 'queues/ringinuse_and_pause'
-    - test: 'queues/wrapup_time'
+    # Temporarily disabled while failures are debugged
+    #- test: 'queues/ringinuse_and_pause'
+    # Temporarily disabled while failures are debugged
+    #- test: 'queues/wrapup_time'
     - test: 'fastagi/connect'
     - test: 'fastagi/channel-status'
     - test: 'fastagi/hangup'