summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@chef.io>2015-11-30 13:51:36 +0000
committerThom May <thom@may.lt>2015-11-30 13:51:36 +0000
commitdb3cea1ef29f6cf7a72dff46d0c8bc7daab0fdf4 (patch)
tree65368b7865ae07645446b7bd35c540f36a444ad3
parent8e51d333ada0eebd065bbbeca5c69260219d008e (diff)
downloadchef-zero-tm/ignore-pedant-universe.tar.gz
Ignore the universe endpoint tests in pedanttm/ignore-pedant-universe
-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 726279f..0fad3e2 100644
--- a/spec/run_oc_pedant.rb
+++ b/spec/run_oc_pedant.rb
@@ -106,7 +106,10 @@ begin
# Chef 12 features not yet 100% supported by Chef Zero
'--skip-cookbook-artifacts',
'--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 = []