summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@chef.io>2016-08-01 19:43:58 +0100
committerThom May <thom@may.lt>2016-08-02 09:40:35 +0100
commit189893fa7fc5669d6106d2bdfa45c0c68f791003 (patch)
tree3481b01d60e1adbb42cfae2eb2c018b048eb179d
parent3dce33d931409b8bebf224ffc20ce28d19a2899c (diff)
downloadchef-zero-tm/run_more_pedant.tar.gz
Enable policy, cookbook artifacts and ACL pedant teststm/run_more_pedant
Signed-off-by: Thom May <thom@may.lt>
-rw-r--r--spec/run_oc_pedant.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/spec/run_oc_pedant.rb b/spec/run_oc_pedant.rb
index 0347fbc..e87fc66 100644
--- a/spec/run_oc_pedant.rb
+++ b/spec/run_oc_pedant.rb
@@ -135,16 +135,17 @@ begin
else
[]
end
- # The latest released Chef doesn't do ACLs, Cookbook Artifacts or Policies yet
- chef_fs_skips << "--skip-acl"
- chef_fs_skips << "--skip-cookbook-artifacts"
- chef_fs_skips << "--skip-policies"
- # Multi-keys don't work prior to 12.8
unless Gem::Requirement.new(">= 12.8.0").satisfied_by?(Gem::Version.new(Chef::VERSION))
chef_fs_skips << "--skip-keys"
end
+ unless Gem::Requirement.new(">= 12.13.19").satisfied_by?(Gem::Version.new(Chef::VERSION))
+ chef_fs_skips << "--skip-acl"
+ chef_fs_skips << "--skip-cookbook-artifacts"
+ chef_fs_skips << "--skip-policies"
+ end
+
# These things aren't supported by Chef Zero in any mode of operation:
default_skips = [
# "the goal is that only authorization, authentication and validation tests