diff options
| author | Jordan Running <jr@getchef.com> | 2016-02-18 15:43:56 -0600 |
|---|---|---|
| committer | Jordan Running <jr@getchef.com> | 2016-02-24 14:16:30 -0600 |
| commit | b0971ce66e69cefd6e148a648f01667c0146e577 (patch) | |
| tree | 87f2d5b56f1fe50f27d69150133f5201a12ae527 /spec/run_oc_pedant.rb | |
| parent | 2469894eab12f24893916b571a981e082dfe97df (diff) | |
| download | chef-zero-jr/pedant-keys-2.tar.gz | |
Move default keys logic into ActorDefaultKeyEndpoint; fix #putjr/pedant-keys-2
Diffstat (limited to 'spec/run_oc_pedant.rb')
| -rw-r--r-- | spec/run_oc_pedant.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/spec/run_oc_pedant.rb b/spec/run_oc_pedant.rb index c3d4e7f..b8c6898 100644 --- a/spec/run_oc_pedant.rb +++ b/spec/run_oc_pedant.rb @@ -140,14 +140,17 @@ begin 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 + # 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 # are turned off" - @jkeiser # # ...but we're not there yet - '--skip-controls', - '--skip-acl', # Chef Zero does not intend to support validation the way erchef does. '--skip-validation', |