infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Land #2627, fix rspec tests for OSX folks 

It is extremely bad to be failing every time, since this tends to cause
people to not trust rspec at all.
bug/bundler_fix
Tod Beardsley 2013-11-11 17:20:28 -06:00
parent bd7d11d5fc b48950d383
commit 9e603574ae
No known key found for this signature in database
GPG Key ID: 1EFFB682ADB9F193
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spec/lib/msf/util/exe_spec.rb
View File

@ -12,8 +12,6 @@ describe Msf::Util::EXE do
described_class
end
before { pending "Pending RM#8463, fix all these these tests up." }
$framework = Msf::Simple::Framework.create(
:module_types => [ Msf::MODULE_NOP ],
'DisableDatabase' => true

20
spec/support/shared/contexts/msf/util/exe.rb
View File

@ -24,10 +24,10 @@ shared_context 'Msf::Util::Exe' do
{ :format => "loop-vbs", :arch => "x86_64", :file_fp => /ASCII/ },
{ :format => "asp", :arch => "x86", :file_fp => /ASCII/ },
{ :format => "asp", :arch => "x86_64", :file_fp => /ASCII/ },
{ :format => "aspx-exe", :arch => "x86", :file_fp => /ASCII/ },
{ :format => "aspx-exe", :arch => "x86_64", :file_fp => /ASCII/ },
{ :format => "aspx", :arch => "x86", :file_fp => /ASCII/ },
{ :format => "aspx", :arch => "x86_64", :file_fp => /ASCII/ },
{ :format => "aspx-exe", :arch => "x86", :file_fp => /(ASCII)|(HTML document text)/ },
{ :format => "aspx-exe", :arch => "x86_64", :file_fp => /(ASCII)|(HTML document text)/ },
{ :format => "aspx", :arch => "x86", :file_fp => /(ASCII)|(HTML document text)/ },
{ :format => "aspx", :arch => "x86_64", :file_fp => /(ASCII)|(HTML document text)/ },
{ :format => "vba", :arch => "x86", :file_fp => /ASCII/ },
{ :format => "vba", :arch => "x86_64", :file_fp => /ASCII/ },
{ :format => "vba-exe", :arch => "x86", :file_fp => /ASCII/ },
@ -38,12 +38,12 @@ shared_context 'Msf::Util::Exe' do
{ :format => "psh-net", :arch => "x86_64", :file_fp => /ASCII/ },
{ :format => "war", :arch => "x86", :file_fp => /Zip/ },
{ :format => "war", :arch => "x86_64", :file_fp => /Zip/ },
{ :format => "msi", :arch => "x86", :file_fp => /Composite Document/ },
{ :format => "msi", :arch => "x64", :file_fp => /Composite Document/ },
{ :format => "msi", :arch => "x86_64", :file_fp => /Composite Document/ },
{ :format => "msi-nouac", :arch => "x86", :file_fp => /Composite Document/ },
{ :format => "msi-nouac", :arch => "x64", :file_fp => /Composite Document/ },
{ :format => "msi-nouac", :arch => "x86_64", :file_fp => /Composite Document/ },
{ :format => "msi", :arch => "x86", :file_fp => /(Composite Document)|(CDF V2 Document)/ },
{ :format => "msi", :arch => "x64", :file_fp => /(Composite Document)|(CDF V2 Document)/ },
{ :format => "msi", :arch => "x86_64", :file_fp => /(Composite Document)|(CDF V2 Document)/ },
{ :format => "msi-nouac", :arch => "x86", :file_fp => /(Composite Document)|(CDF V2 Document)/ },
{ :format => "msi-nouac", :arch => "x64", :file_fp => /(Composite Document)|(CDF V2 Document)/ },
{ :format => "msi-nouac", :arch => "x86_64", :file_fp => /(Composite Document)|(CDF V2 Document)/ },
],
"linux" => [
{ :format => "elf", :arch => "x86", :file_fp => /ELF 32.*SYSV/ },