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

add test for when run is not specified in waiver (5370)

Browse source
This commit is contained in:
Clinton Wolfe 2021-01-05 12:01:34 -05:00 committed by GitHub
commit c13f780b8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs-chef-io/content/inspec/waivers.md
View file

@ -42,8 +42,8 @@ control_id:
```
- `expiration_date` is optional. Absence means the waiver is permanent.
- `run` is optional. If present and true, the control will run and be
reported, but failures in it won't make the overall run fail. If absent or false, the control will not be run. You may use any of yes, no, true or false.
- `run` is optional. If absent or true, the control will run and be
reported, but failures in it won't make the overall run fail. If present and false, the control will not be run. You may use any of yes, no, true or false. To avoid confusion, it is good practice to explicitly specify whether the control should run.
- `justification` can be any text you want and might include a reason
as well as who signed off on the waiver.

6
test/fixtures/profiles/waivers/basic/controls/basic.rb vendored
View file

@ -65,4 +65,8 @@ end
control "17_waivered_expiry_in_future_string_not_ran" do
describe(true) { it { should eq true } }
end
end
control "18_waivered_no_expiry_default_run" do
describe(true) { it { should eq false } }
end

5
test/fixtures/profiles/waivers/basic/files/waivers.yaml vendored
View file

@ -68,4 +68,7 @@
17_waivered_expiry_in_future_string_not_ran:
expiration_date: "2077-06-01"
justification: Lack of imagination
run: false
run: false
18_waivered_no_expiry_default_run:
justification: Too lazy to specify run, which defaults to true

4
test/functional/waivers_test.rb
View file

@ -48,6 +48,7 @@ describe "waivers" do
in_past = !!(control_id =~ /in_past/)
in_future = !!(control_id =~ /in_future/)
ran = !!(control_id !~ /not_ran/)
default_run = !!(control_id =~ /default_run/)
waiver_expired_in_past = /Waiver expired/ =~ act["message"]
# higher logic
@ -58,7 +59,7 @@ describe "waivers" do
assert_instance_of Hash, act
assert_stringy act["justification"] # TODO: optional?
assert_equal ran, act["run"]
assert_equal ran, act["run"] unless default_run
assert_equal waived, act["skipped_due_to_waiver"]
assert_stringy act["message"] if has_message
# We supply a message indicating that the waiver has expired in all cases
@ -100,6 +101,7 @@ describe "waivers" do
"15_waivered_expiry_in_future_string_ran_passes" => "passed",
"16_waivered_expiry_in_future_string_ran_fails" => "failed",
"17_waivered_expiry_in_future_string_not_ran" => "skipped",
"18_waivered_no_expiry_default_run" => "failed",
}.each do |control_id, expected|
it "has all of the expected outcomes #{control_id}" do
assert_test_outcome expected, control_id