From d103d2a9ee3df96a2fb4179014ae759ff8a4ab53 Mon Sep 17 00:00:00 2001 From: Wade Alcorn Date: Thu, 12 Jan 2012 17:38:55 +1000 Subject: [PATCH] MSF start wait time increased to 45 secs from 30 secs --- rakefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/rakefile b/rakefile index d7736b39a..955c32aea 100644 --- a/rakefile +++ b/rakefile @@ -18,17 +18,14 @@ task :default => ["quick"] desc "Run quick unit tests" task :quick do - sh "cd test/unit/;ruby -W0 ts_unit.rb" + Rake::Task['unit'].invoke end desc "Run all unit tests" task :all => ["install", "msf_install"] do Rake::Task['integration'].invoke # run integration tests Rake::Task['unit'].invoke # run unit tests - Rake::Task['msf_update'].invoke - Rake::Task['msf_start'].invoke - sh "cd test/unit/;ruby -W0 ts_beef.rb" - Rake::Task['msf_stop'].invoke + Rake::Task['msf'].invoke # run msf tests end desc "Run integration unit tests" @@ -59,10 +56,10 @@ end @msf_process_id = nil; task :msf_start => '/tmp/msf-test/msfconsole' do - printf "Starting MSF (wait 30 seconds)..." + printf "Starting MSF (wait 45 seconds)..." @msf_process_id = IO.popen("/tmp/msf-test/msfconsole -r test/thirdparty/msf/unit/BeEF.rc 2> /dev/null", "w+") - delays = [7, 6, 5, 4, 3, 2, 1, 0.7, 0.5, 0.3, 0.2, 0.1, 0.1, 0.1, 0.05, 0.05] - delays.each do |i| # delay for 30 seconds + delays = [10, 7, 6, 5, 4, 3, 2, 2, 1, 1, 1, 0.5, 0.5 , 0.5, 0.3, 0.2, 0.1, 0.1, 0.1, 0.05, 0.05] + delays.each do |i| # delay for 45 seconds printf '.' sleep (i) # increase the . display rate end @@ -79,7 +76,7 @@ task :msf_install => '/tmp/msf-test/msfconsole' do end task :msf_update => '/tmp/msf-test/msfconsole' do - sh "cd /tmp/msf-test;git pull" + sh "cd /tmp/msf-test;git pull" end file '/tmp/msf-test/msfconsole' do