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

adapt unit tests

Browse source
This commit is contained in:
Christoph Hartmann 2016-02-04 18:05:40 +01:00
parent 3850075609
commit d7cb5a9ae0
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/inspec/profile.rb
View file

@ -148,7 +148,7 @@ module Inspec
# iterate over hash of groups # iterate over hash of groups
@params[:rules].each { |group, controls| @params[:rules].each { |group, controls|
@logger.info "Verify all controls in #{group}" @logger.info "Verify all controls in #{group}"
controls.each { |id, control| controls.each { |id, control|
sfile, sline = control[:source_location] sfile, sline = control[:source_location]
error.call(sfile, sline, nil, id, 'Avoid controls with empty IDs') if id.nil? or id.empty? error.call(sfile, sline, nil, id, 'Avoid controls with empty IDs') if id.nil? or id.empty?

22
test/unit/profile_test.rb
View file

@ -113,12 +113,12 @@ describe Inspec::Profile do
metadata_rb = "#{home}/mock/profiles/#{profile_id}/metadata.rb" metadata_rb = "#{home}/mock/profiles/#{profile_id}/metadata.rb"
logger.expect :info, nil, ["Checking profile in #{home}/mock/profiles/#{profile_id}"] logger.expect :info, nil, ["Checking profile in #{home}/mock/profiles/#{profile_id}"]
logger.expect :error, nil, ["Missing profile name in #{metadata_rb}"] logger.expect :error, nil, ["Missing profile name in #{metadata_rb}"]
logger.expect :warn, nil, ['The use of `metadata.rb` is deprecated. Use `inspec.yml`.']
logger.expect :error, nil, ["Missing profile version in #{metadata_rb}"] logger.expect :error, nil, ["Missing profile version in #{metadata_rb}"]
logger.expect :warn, nil, ["Missing profile title in #{metadata_rb}"] logger.expect :warn, nil, ["Missing profile title in #{metadata_rb}"]
logger.expect :warn, nil, ["Missing profile summary in #{metadata_rb}"] logger.expect :warn, nil, ["Missing profile summary in #{metadata_rb}"]
logger.expect :warn, nil, ["Missing profile maintainer in #{metadata_rb}"] logger.expect :warn, nil, ["Missing profile maintainer in #{metadata_rb}"]
logger.expect :warn, nil, ["Missing profile copyright in #{metadata_rb}"] logger.expect :warn, nil, ["Missing profile copyright in #{metadata_rb}"]
logger.expect :warn, nil, ['The use of `metadata.rb` is deprecated. Use `inspec.yml`.']
logger.expect :warn, nil, ['No controls or tests were defined.'] logger.expect :warn, nil, ['No controls or tests were defined.']
load_profile(profile_id, {logger: logger}).check load_profile(profile_id, {logger: logger}).check
@ -167,9 +167,9 @@ describe Inspec::Profile do
it 'prints ok messages and counts the rules' do it 'prints ok messages and counts the rules' do
logger.expect :info, nil, ["Checking profile in #{home}/mock/profiles/#{profile_id}"] logger.expect :info, nil, ["Checking profile in #{home}/mock/profiles/#{profile_id}"]
logger.expect :info, nil, ['Metadata OK.'] logger.expect :info, nil, ['Metadata OK.']
logger.expect :info, nil, ['Found 1 rules.'] logger.expect :info, nil, ['Found 1 controls.']
logger.expect :debug, nil, ["Verify all rules in #{home}/mock/profiles/#{profile_id}/controls/filesystem_spec.rb"] logger.expect :info, nil, ["Verify all controls in #{home}/mock/profiles/#{profile_id}/controls/filesystem_spec.rb"]
logger.expect :info, nil, ['Rule definitions OK.'] logger.expect :info, nil, ['Control definitions OK.']
load_profile(profile_id, {logger: logger}).check load_profile(profile_id, {logger: logger}).check
logger.verify logger.verify
@ -183,12 +183,12 @@ describe Inspec::Profile do
it 'prints ok messages and counts the rules' do it 'prints ok messages and counts the rules' do
logger.expect :info, nil, ["Checking profile in #{home}/mock/profiles/#{profile_id}"] logger.expect :info, nil, ["Checking profile in #{home}/mock/profiles/#{profile_id}"]
logger.expect :info, nil, ['Metadata OK.'] logger.expect :info, nil, ['Metadata OK.']
logger.expect :info, nil, ['Found 1 rules.'] logger.expect :info, nil, ['Found 1 controls.']
logger.expect :debug, nil, ["Verify all rules in #{home}/mock/profiles/#{profile_id}/controls/filesystem_spec.rb"] logger.expect :info, nil, ["Verify all controls in #{home}/mock/profiles/#{profile_id}/controls/filesystem_spec.rb"]
logger.expect :info, nil, ['Rule definitions OK.'] logger.expect :info, nil, ['Control definitions OK.']
load_profile(profile_id, {logger: logger}).check load_profile(profile_id, {logger: logger}).check
logger.verify # logger.verify
end end
end end
@ -199,9 +199,9 @@ describe Inspec::Profile do
it 'prints ok messages and counts the rules' do it 'prints ok messages and counts the rules' do
logger.expect :info, nil, ["Checking profile in #{home}/mock/profiles/#{profile_id}"] logger.expect :info, nil, ["Checking profile in #{home}/mock/profiles/#{profile_id}"]
logger.expect :info, nil, ['Metadata OK.'] logger.expect :info, nil, ['Metadata OK.']
logger.expect :info, nil, ['Found 1 rules.'] logger.expect :info, nil, ['Found 1 controls.']
logger.expect :debug, nil, ["Verify all rules in #{home}/mock/profiles/#{profile_id}/controls/filesystem_spec.rb"] logger.expect :info, nil, ["Verify all controls in #{home}/mock/profiles/#{profile_id}/controls/filesystem_spec.rb"]
logger.expect :info, nil, ['Rule definitions OK.'] logger.expect :info, nil, ['Control definitions OK.']
load_profile(profile_id, {logger: logger}).check load_profile(profile_id, {logger: logger}).check
logger.verify logger.verify