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