Join killed threads to ensure cleanup

MSP-9653
bug/bundler_fix
Luke Imhoff 2014-06-05 12:40:24 -05:00
parent ca63d2201e
commit 5ae5448005
No known key found for this signature in database
GPG Key ID: 5B1FB01FB33356F8
1 changed files with 5 additions and 1 deletions

View File

@ -4,7 +4,7 @@ require 'metasploit/framework'
shared_context 'Msf::Simple::Framework' do
let(:dummy_pathname) do
Metasploit::Framework.root.join('spec', 'dummy')
Rails.root.join('spec', 'dummy')
end
let(:framework) do
@ -33,8 +33,12 @@ shared_context 'Msf::Simple::Framework' do
thread_manager.each do |thread|
thread.kill
# ensure killed thread is cleaned up by VM
thread.join
end
thread_manager.monitor.kill
# ensure killed thread is cleaned up by VM
thread_manager.monitor.join
end
end