diff options
author | kaustubh-d <kaustubh@clogeny.com> | 2014-11-18 14:56:22 +0530 |
---|---|---|
committer | Bryan McLellan <btm@opscode.com> | 2015-02-17 09:16:38 -0500 |
commit | 6909f4074dbd9cee5906333f693bd282476a6ac5 (patch) | |
tree | 7deb7fcea3b0409b23986f317649f8ec18fa241e /spec/functional | |
parent | aa9b233614da81c506929cc1c36eb509a4e2c97e (diff) | |
download | chef-6909f4074dbd9cee5906333f693bd282476a6ac5.tar.gz |
fix aix related providers to replace popen4 with mixlib shell_out
Diffstat (limited to 'spec/functional')
-rwxr-xr-x | spec/functional/resource/aix_service_spec.rb | 3 | ||||
-rw-r--r-- | spec/functional/version_spec.rb | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/spec/functional/resource/aix_service_spec.rb b/spec/functional/resource/aix_service_spec.rb index 6008fdea8f..9dec87db93 100755 --- a/spec/functional/resource/aix_service_spec.rb +++ b/spec/functional/resource/aix_service_spec.rb @@ -73,6 +73,9 @@ shared_examples "src service" do end describe Chef::Resource::Service, :requires_root, :aix_only do + + include Chef::Mixin::ShellOut + def get_user_id shell_out("id -u #{ENV['USER']}").stdout.chomp end diff --git a/spec/functional/version_spec.rb b/spec/functional/version_spec.rb index 71ba4d5b2f..cd5bbc7678 100644 --- a/spec/functional/version_spec.rb +++ b/spec/functional/version_spec.rb @@ -28,7 +28,7 @@ describe "Chef Versions" do binaries.each do |binary| it "#{binary} version should be sane" do - expect(shell_out!("ruby #{File.join("bin", binary)} -v", :cwd => chef_dir).stdout.chomp).to eq("Chef: #{Chef::VERSION}") + expect(shell_out!("ruby #{File.join("bin", binary)} -v", :cwd => chef_dir).stdout.chomp).to include("Chef: #{Chef::VERSION}") end end |