From a5c6179e10d11df84f1b18106751322020b2ca3a Mon Sep 17 00:00:00 2001
From: Saafan <a.m.saafan@gmail.com>
Date: Thu, 5 Jan 2012 16:14:51 +0200
Subject: [PATCH] Cleans up rake output for MSFIntegration Unit tests. Fixes
 issue 28

---
 extensions/metasploit/rpcclient.rb    | 6 +++++-
 test/unit/extensions/tc_metasploit.rb | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/extensions/metasploit/rpcclient.rb b/extensions/metasploit/rpcclient.rb
index 80e2d2f5b..aa2df4305 100644
--- a/extensions/metasploit/rpcclient.rb
+++ b/extensions/metasploit/rpcclient.rb
@@ -34,6 +34,7 @@ module Metasploit
 		  
             		@lock = false
 			@lastauth = nil
+			@unit_test = false
 			opts = {
 				 :host => @config['host'] || '127.0.0.1',
 				 :port => @config['port'] || 55552,
@@ -63,6 +64,9 @@ module Metasploit
 		ret
 	end
     
+	def unit_test_init
+		@unit_test = true
+	end
         # login into metasploit
 		def login
             		get_lock()
@@ -74,7 +78,7 @@ module Metasploit
 				return false
 			end
 			
-			print_info 'Successful connection with Metasploit.' if not @lastauth
+			print_info 'Successful connection with Metasploit.' if (!@lastauth && !@unit_test)
 			
 			@lastauth = Time.now
       
diff --git a/test/unit/extensions/tc_metasploit.rb b/test/unit/extensions/tc_metasploit.rb
index 6c9baf310..f0478f35b 100644
--- a/test/unit/extensions/tc_metasploit.rb
+++ b/test/unit/extensions/tc_metasploit.rb
@@ -20,7 +20,7 @@ class TC_Metasploit < Test::Unit::TestCase
 
   def setup
     $root_dir="../../"
-    $:.unshift File.join( %w{ ../../ } )
+    $:.unshift File.join( %w{ ../../ } )		
   end
 
   #
@@ -45,6 +45,7 @@ class TC_Metasploit < Test::Unit::TestCase
       load_config
       require 'extensions/metasploit/extension.rb'
       @api = BeEF::Extension::Metasploit::RpcClient.instance
+			@api.unit_test_init()
   end
  
   #
@@ -73,7 +74,7 @@ class TC_Metasploit < Test::Unit::TestCase
   # Verify that the login is working
   #
   def test_login
-    new_api
+    new_api		
     assert(@api.login)
   end