From 1b25522ce0855edae971934bc3c9ade681685274 Mon Sep 17 00:00:00 2001
From: Ben Waugh <ben@delonge.com.au>
Date: Tue, 27 Dec 2011 23:23:06 +1000
Subject: [PATCH] fixed bug in MSF startup during rake tests

---
 test/unit/ts_beef.rb | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/test/unit/ts_beef.rb b/test/unit/ts_beef.rb
index c14d94c13..0113b1d9c 100644
--- a/test/unit/ts_beef.rb
+++ b/test/unit/ts_beef.rb
@@ -49,16 +49,9 @@ require './tc_filesystem'
 require './extensions/tc_metasploit'
 
 begin
-  child = fork do
-	Signal.trap("TERM") do 
-	  puts "Shutting Down"
-	  exit 99
-	end
-      puts "Starting MSF..."
-  	%x{cd ../msf;./msfconsole -r ../unit/BeEF.rc}
-  	exit 99
-  end
-  sleep 25
+  puts "Starting MSF..."
+  p2 = IO.popen("../msf/msfconsole -r ../unit/BeEF.rc", "w+")
+  sleep 30
 end
 
 class TS_BeefTests
@@ -79,8 +72,6 @@ end
 Test::Unit::UI::Console::TestRunner.run(TS_BeefTests)
 
 begin
-  puts "\nShutting down MSF ()...\n"
-  Process.kill("TERM", child)
-  Process.wait
-  sleep 240
+  puts "\nShutting down MSF...\n"
+  p2.puts "quit"
 end