summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Doherty <cdoherty@chef.io>2015-11-12 12:16:40 -0800
committerChris Doherty <cdoherty@chef.io>2015-11-12 12:16:40 -0800
commitef3afcde61932545ec7e8de5454345bd6f81f755 (patch)
tree696acfca2b657e1d79fa2ea0dd4830e63146cf41
parente01280b38e5f048f89e692f69399b982317cc6ce (diff)
downloadchef-zero-ef3afcde61932545ec7e8de5454345bd6f81f755.tar.gz
Include additional tags to skip under CHEF_FS.
-rw-r--r--spec/run_oc_pedant.rb15
1 files changed, 12 insertions, 3 deletions
diff --git a/spec/run_oc_pedant.rb b/spec/run_oc_pedant.rb
index 405fe0e..6dd503d 100644
--- a/spec/run_oc_pedant.rb
+++ b/spec/run_oc_pedant.rb
@@ -67,12 +67,18 @@ begin
require 'pedant'
require 'pedant/organization'
- Pedant::Config.rerun = true
+ # Pedant::Config.rerun = true
Pedant.config.suite = 'api'
Pedant.config[:config_file] = 'spec/support/oc_pedant.rb'
+ chef_fs_skips = if ENV['CHEF_FS']
+ [ '--skip-association' ]
+ else
+ []
+ end
+
# "the goal is that only authorization, authentication and validation tests are turned off" - @jkeiser
Pedant.setup([
'--skip-knife',
@@ -91,9 +97,12 @@ begin
'--skip-cookbook-artifacts',
'--skip-containers',
'--skip-api-v1'
- ])
+ ] + chef_fs_skips)
+
+ # fail_fast = ["--fail-fast"]
+ fail_fast = []
- result = RSpec::Core::Runner.run(Pedant.config.rspec_args)
+ result = RSpec::Core::Runner.run(Pedant.config.rspec_args + fail_fast)
server.stop if server.running?
ensure