summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Doherty <cdoherty@chef.io>2015-11-12 13:36:50 -0800
committerChris Doherty <cdoherty@chef.io>2015-11-12 13:36:50 -0800
commitad52b81b69390eb6569962112c42a00da4a80d7e (patch)
treeed62ef451a2dbf706ca47256b343ad11e95cc014
parentef3afcde61932545ec7e8de5454345bd6f81f755 (diff)
downloadchef-zero-ad52b81b69390eb6569962112c42a00da4a80d7e.tar.gz
'everything' -> 'hosted_everything'; add tag exclusions for stuff chef-zero doesn't do.
-rw-r--r--spec/run_oc_pedant.rb10
1 files changed, 7 insertions, 3 deletions
diff --git a/spec/run_oc_pedant.rb b/spec/run_oc_pedant.rb
index 6dd503d..0ce9f7a 100644
--- a/spec/run_oc_pedant.rb
+++ b/spec/run_oc_pedant.rb
@@ -22,7 +22,7 @@ def start_cheffs_server(chef_repo_path)
end
# Start the new server
- Chef::Config.repo_mode = 'everything'
+ Chef::Config.repo_mode = 'hosted_everything'
Chef::Config.chef_repo_path = chef_repo_path
Chef::Config.versioned_cookbooks = true
chef_fs = Chef::ChefFS::Config.new.local_fs
@@ -74,7 +74,11 @@ begin
Pedant.config[:config_file] = 'spec/support/oc_pedant.rb'
chef_fs_skips = if ENV['CHEF_FS']
- [ '--skip-association' ]
+ [ '--skip-association',
+ '--skip-users',
+ '--skip-organizations',
+ '--skip-policies' # these are expected to be broken.
+ ]
else
[]
end
@@ -99,8 +103,8 @@ begin
'--skip-api-v1'
] + chef_fs_skips)
- # fail_fast = ["--fail-fast"]
fail_fast = []
+ # fail_fast = ["--fail-fast"]
result = RSpec::Core::Runner.run(Pedant.config.rspec_args + fail_fast)