Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2024-11-23 13:13:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

return empty array instead of nil to be .each friendly

Browse source
This commit is contained in:
Alex Pop 2016-05-11 22:21:22 +01:00
parent 21a91f964c
commit 2a9d9b5481
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/resources/port.rb
View file

@ -59,22 +59,22 @@ module Inspec::Resources
def protocols def protocols
res = info.map { |x| x[:protocol] }.uniq.compact res = info.map { |x| x[:protocol] }.uniq.compact
res.size > 0 ? res : nil res.size > 0 ? res : []
end end
def processes def processes
res = info.map { |x| x[:process] }.uniq.compact res = info.map { |x| x[:process] }.uniq.compact
res.size > 0 ? res : nil res.size > 0 ? res : []
end end
def addresses def addresses
res = info.map { |x| x[:address] }.uniq.compact res = info.map { |x| x[:address] }.uniq.compact
res.size > 0 ? res : nil res.size > 0 ? res : []
end end
def pids def pids
res = info.map { |x| x[:pid] }.uniq.compact res = info.map { |x| x[:pid] }.uniq.compact
res.size > 0 ? res : nil res.size > 0 ? res : []
end end
def to_s def to_s

16
test/unit/resources/port_test.rb
View file

@ -36,7 +36,7 @@ describe 'Inspec::Resources::Port' do
resource = MockLoader.new(:windows).load_resource('port', 135) resource = MockLoader.new(:windows).load_resource('port', 135)
_(resource.listening?).must_equal true _(resource.listening?).must_equal true
_(resource.protocols).must_equal ['tcp'] _(resource.protocols).must_equal ['tcp']
_(resource.processes).must_equal nil _(resource.processes).must_equal []
_(resource.addresses).must_equal ["::", "192.168.10.157"] _(resource.addresses).must_equal ["::", "192.168.10.157"]
end end
@ -60,10 +60,10 @@ describe 'Inspec::Resources::Port' do
it 'verify running on undefined' do it 'verify running on undefined' do
resource = MockLoader.new(:undefined).load_resource('port', 22) resource = MockLoader.new(:undefined).load_resource('port', 22)
_(resource.listening?).must_equal false _(resource.listening?).must_equal false
_(resource.protocols).must_equal nil _(resource.protocols).must_equal []
_(resource.pids).must_equal nil _(resource.pids).must_equal []
_(resource.processes).must_equal nil _(resource.processes).must_equal []
_(resource.addresses).must_equal nil _(resource.addresses).must_equal []
end end
it 'verify port and interface on Ubuntu 14.04' do it 'verify port and interface on Ubuntu 14.04' do
@ -78,7 +78,7 @@ describe 'Inspec::Resources::Port' do
it 'verify not listening port on interface on Ubuntu 14.04' do it 'verify not listening port on interface on Ubuntu 14.04' do
resource = MockLoader.new(:ubuntu1404).load_resource('port', '127.0.0.1', 22) resource = MockLoader.new(:ubuntu1404).load_resource('port', '127.0.0.1', 22)
_(resource.listening?).must_equal false _(resource.listening?).must_equal false
_(resource.addresses).must_equal nil _(resource.addresses).must_equal []
end end
it 'verify port on Solaris 10' do it 'verify port on Solaris 10' do
@ -103,7 +103,7 @@ describe 'Inspec::Resources::Port' do
it 'verify not listening port on hpux' do it 'verify not listening port on hpux' do
resource = MockLoader.new(:hpux).load_resource('port', 23) resource = MockLoader.new(:hpux).load_resource('port', 23)
_(resource.listening?).must_equal false _(resource.listening?).must_equal false
_(resource.protocols).must_equal nil _(resource.protocols).must_equal []
_(resource.addresses).must_equal nil _(resource.addresses).must_equal []
end end
end end