summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@may.lt>2015-12-15 15:57:42 +0000
committerThom May <thom@may.lt>2015-12-15 15:57:42 +0000
commit828353206144db8163b0942da8cb0e14a0ff2e62 (patch)
treeeff5779bff2088259a10ccc786e312aa0aeae093
parent6a6ddf670c4429b754a241bb693f2ddd15d69e8e (diff)
parentdb3cea1ef29f6cf7a72dff46d0c8bc7daab0fdf4 (diff)
downloadchef-zero-828353206144db8163b0942da8cb0e14a0ff2e62.tar.gz
Merge pull request #176 from chef/tm/ignore-pedant-universe
Ignore the universe endpoint tests in pedant
-rw-r--r--Gemfile2
-rw-r--r--spec/run_oc_pedant.rb5
2 files changed, 5 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index c0d8cbc..be2e640 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ gemspec
gem 'rest-client', :github => 'chef/rest-client'
-gem 'oc-chef-pedant', :github => 'chef/chef-server'
+gem 'oc-chef-pedant', :github => 'chef/chef-server', :branch => 'tm/rfc-014-universe'
# gem 'oc-chef-pedant', :path => "../chef-server"
diff --git a/spec/run_oc_pedant.rb b/spec/run_oc_pedant.rb
index 3cf873c..ab99cc8 100644
--- a/spec/run_oc_pedant.rb
+++ b/spec/run_oc_pedant.rb
@@ -108,7 +108,10 @@ begin
# Chef 12 features not yet 100% supported by Chef Zero
'--skip-containers',
- '--skip-api-v1'
+ '--skip-api-v1',
+
+ # The universe endpoint is unlikely to ever make sense for Chef Zero
+ '--skip-universe'
] + chef_fs_skips)
fail_fast = []