summaryrefslogtreecommitdiff
path: root/spec/support/pedant
diff options
context:
space:
mode:
authorJohn Keiser <jkeiser@opscode.com>2014-05-26 22:19:45 -0700
committerJohn Keiser <jkeiser@opscode.com>2014-05-27 07:23:42 -0700
commitd3bd7e18b7378a19fa402d9b34788b9dc1e466bf (patch)
tree3775bd0519d27974f136eab5c6ba4a7136113cdc /spec/support/pedant
parentc60605c65954176c9a3daa0bf6bd27e56a5c9880 (diff)
downloadchef-d3bd7e18b7378a19fa402d9b34788b9dc1e466bf.tar.gz
Explicitly add org defaults to pedant test
so that it passes, but don't feed the defaults to the user by default.
Diffstat (limited to 'spec/support/pedant')
-rw-r--r--spec/support/pedant/run_pedant.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/support/pedant/run_pedant.rb b/spec/support/pedant/run_pedant.rb
index 0c24cf59f8..94c4e5c413 100644
--- a/spec/support/pedant/run_pedant.rb
+++ b/spec/support/pedant/run_pedant.rb
@@ -25,6 +25,7 @@ def start_server(chef_repo_path)
Chef::Config.versioned_cookbooks = true
chef_fs = Chef::ChefFS::Config.new.local_fs
data_store = Chef::ChefFS::ChefFSDataStore.new(chef_fs)
+ data_store = ChefZero::DataStore::V1ToV2Adapter.new(data_store, 'chef', ChefZero::DataStore::V1ToV2Adapter.ORG_DEFAULTS)
server = ChefZero::Server.new(:port => 8889, :data_store => data_store)#, :log_level => :debug)
server.start_background
server