diff options
| author | Jay Mundrawala <jdmundrawala@gmail.com> | 2016-02-01 19:15:16 -0800 |
|---|---|---|
| committer | Jay Mundrawala <jdmundrawala@gmail.com> | 2016-02-01 19:19:14 -0800 |
| commit | a82ce28d91d5071ce5619907ad7a6c93369061b6 (patch) | |
| tree | b28fc3ed9bca0eb53fbc740ea062f86788ac0a5e | |
| parent | 1064f01875e50f90aeda2b5575406b3dabe27f8e (diff) | |
| download | chef-a82ce28d91d5071ce5619907ad7a6c93369061b6.tar.gz | |
Use OHAI_SYSTEM for dsc_script_spec
| -rw-r--r-- | spec/functional/resource/dsc_script_spec.rb | 4 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/spec/functional/resource/dsc_script_spec.rb b/spec/functional/resource/dsc_script_spec.rb index 67fa30d815..131ec20b4c 100644 --- a/spec/functional/resource/dsc_script_spec.rb +++ b/spec/functional/resource/dsc_script_spec.rb @@ -385,9 +385,7 @@ EOH before(:each) do delete_user(dsc_user) - ohai_reader = Ohai::System.new - ohai_reader.all_plugins(["platform", "os", "languages/powershell"]) - dsc_test_run_context.node.consume_external_attrs(ohai_reader.data,{}) + dsc_test_run_context.node.consume_external_attrs(OHAI_SYSTEM.data,{}) end let(:configuration_data_path) { 'C:\\configurationdata.psd1' } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 50a39db584..464705eab0 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -90,7 +90,7 @@ Dir["spec/support/**/*.rb"]. each { |f| require f } OHAI_SYSTEM = Ohai::System.new -OHAI_SYSTEM.all_plugins(["platform", "hostname"]) +OHAI_SYSTEM.all_plugins(["platform", "hostname", "languages/powershell"]) test_node = Chef::Node.new test_node.automatic["os"] = (OHAI_SYSTEM["os"] || "unknown_os").dup.freeze |