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

Merge pull request #1366 from makotots/mn/json-variable-name-fix

Browse source 
JSON resource's error message is missing filename when file is not found
This commit is contained in:
Christoph Hartmann 2016-12-15 15:17:28 +01:00 committed by GitHub
commit 6e2b21e1f8
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/resources/json.rb
View file

@ -44,13 +44,13 @@ module Inspec::Resources
# check if file is available
if !@file.file?
skip_resource "Can't find file \"#{@conf_path}\""
skip_resource "Can't find file \"#{@path}\""
return @params = {}
end
# check if file is readable
if @file_content.empty? && @file.size > 0
skip_resource "Can't read file \"#{@conf_path}\""
skip_resource "Can't read file \"#{@path}\""
return @params = {}
end
end

1
test/helper.rb
View file

@ -114,6 +114,7 @@ class MockLoader
'kitchen.yml' => mockfile.call('kitchen.yml'),
'example.csv' => mockfile.call('example.csv'),
'policyfile.lock.json' => mockfile.call('policyfile.lock.json'),
'nonexistent.json' => mockfile.call('nonexistent.json'),
'/sys/class/net/br0/bridge' => mockdir.call(true),
'rootwrap.conf' => mockfile.call('rootwrap.conf'),
'/etc/apache2/apache2.conf' => mockfile.call('apache2.conf'),

7
test/unit/resources/json_test.rb
View file

@ -33,4 +33,11 @@ describe 'Inspec::Resources::JSON' do
_(resource.send(:'x.y.z')).must_be_nil
end
end
describe 'when loading a nonexistent file' do
let (:resource) { load_resource('json', 'nonexistent.json') }
it 'produces an error' do
_(resource.resource_skipped).must_equal 'Can\'t find file "nonexistent.json"'
end
end
end