[asterisk-commits] mnicholson: testsuite/asterisk/trunk r410 - /asterisk/trunk/asttest/lib/lua/

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Fri Jun 18 12:44:50 2010
New Revision: 410

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=410
Log:
Revert the previous change, it did not have any effect.

Modified:
    asterisk/trunk/asttest/lib/lua/astlib.lua

Modified: asterisk/trunk/asttest/lib/lua/astlib.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/asttest/lib/lua/astlib.lua?view=diff&rev=410&r1=409&r2=410
==============================================================================
--- asterisk/trunk/asttest/lib/lua/astlib.lua (original)
+++ asterisk/trunk/asttest/lib/lua/astlib.lua Fri Jun 18 12:44:50 2010
@@ -104,12 +104,6 @@
 		"-C", self.asterisk_conf
 	)
 
-	-- note, at one point this read was done after the call to p:wait();
-	-- this may have caused the asterisk process servicing the CLI command
-	-- to receive a SIGPIPE.  Now it is done before waiting for the process
-	-- to exit.
-	local output = p.stdout:read("*a")
-
 	-- wait up to 5 minutes for the process to exit.  If the process does
 	-- not exit within 5 minutes, return a error.
 	local res, err = p:wait(300000)
@@ -117,7 +111,7 @@
 		return res, err
 	end
 
-	return output
+	return p.stdout:read("*a")
 end
 
 function asterisk:spawn()