diff options
| author | tyler-ball <tyleraball@gmail.com> | 2014-09-24 09:18:47 -0700 |
|---|---|---|
| committer | tyler-ball <tyleraball@gmail.com> | 2014-10-07 16:39:56 -0700 |
| commit | 1c7b4629240c49e02c482da6de1a6a2cc574304e (patch) | |
| tree | 4ac2fdc415837aca9b15e6c93debda44858cbf9b /kitchen-tests | |
| parent | 1343bdfff0d54e20b923211f6697d42c484c1627 (diff) | |
| download | chef-1c7b4629240c49e02c482da6de1a6a2cc574304e.tar.gz | |
Trying to eradicate all traces of the JSON gem from Chef
Diffstat (limited to 'kitchen-tests')
| -rw-r--r-- | kitchen-tests/.kitchen.yml | 2 | ||||
| -rw-r--r-- | kitchen-tests/test/fixtures/serverspec_helper.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/kitchen-tests/.kitchen.yml b/kitchen-tests/.kitchen.yml index 651a606502..d13a558c97 100644 --- a/kitchen-tests/.kitchen.yml +++ b/kitchen-tests/.kitchen.yml @@ -2,7 +2,7 @@ provisioner: name: chef_solo github: "opscode/chef" - branch: <%= %x(git rev-parse HEAD) %> + branch: "tball/yajl-replace-json" # TODO replace this when going to master require_chef_omnibus: true data_path: test/fixtures diff --git a/kitchen-tests/test/fixtures/serverspec_helper.rb b/kitchen-tests/test/fixtures/serverspec_helper.rb index 6e6d71e79b..04e99156d6 100644 --- a/kitchen-tests/test/fixtures/serverspec_helper.rb +++ b/kitchen-tests/test/fixtures/serverspec_helper.rb @@ -4,6 +4,7 @@ require 'serverspec' require 'json' +require 'ffi_yajl' set :backend, :exec @@ -21,7 +22,7 @@ def load_nodestub platform = 'centos' platform_version = os[:release].to_i end - JSON.parse(IO.read("#{ENV['BUSSER_ROOT']}/../kitchen/data/platforms/#{platform}/#{platform_version}.json"), :symbolize_names => true) + FFI_Yajl::Encoder.parse(IO.read("#{ENV['BUSSER_ROOT']}/../kitchen/data/platforms/#{platform}/#{platform_version}.json"), :symbolize_names => true) end # centos-59 doesn't have /sbin in the default path, |