diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-08-21 16:07:45 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-21 16:07:45 -0700 |
commit | 9890ce172812a8e5d6527c35346c318fc76d1b8b (patch) | |
tree | 03e63222abdbeb5ab63c54fb2ad2bf4ac6228272 | |
parent | 527222411b853151894393049cd9d2a05eb9aeb2 (diff) | |
parent | e3e81e39b582ca8771a558584b1cc10c85723853 (diff) | |
download | chef-9890ce172812a8e5d6527c35346c318fc76d1b8b.tar.gz |
Merge pull request #7565 from chef/lcg/shell-out-mknod
switch shell_out to shell_out! in func tests
-rw-r--r-- | spec/support/shared/functional/file_resource.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/support/shared/functional/file_resource.rb b/spec/support/shared/functional/file_resource.rb index d025a0806d..8ae5db6a57 100644 --- a/spec/support/shared/functional/file_resource.rb +++ b/spec/support/shared/functional/file_resource.rb @@ -1,6 +1,6 @@ # # Author:: Seth Chisamore (<schisamo@chef.io>) -# Copyright:: Copyright 2011-2016, Chef Software Inc. +# Copyright:: Copyright 2011-2018, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -385,7 +385,7 @@ shared_examples_for "a configured file resource" do def selinux_security_context_restored?(path) @restorecon_path = which("restorecon") if @restorecon_path.nil? restorecon_test_command = "#{@restorecon_path} -n -v #{path}" - cmdresult = shell_out(restorecon_test_command) + cmdresult = shell_out!(restorecon_test_command) # restorecon will print the required changes to stdout if any is # needed cmdresult.stdout.empty? @@ -725,7 +725,7 @@ shared_examples_for "a configured file resource" do end before(:each) do - result = shell_out("mknod #{path} b 1 2") + result = shell_out!("mknod #{path} b 1 2") result.stderr.empty? end @@ -743,7 +743,7 @@ shared_examples_for "a configured file resource" do end before(:each) do - result = shell_out("mknod #{path} c 1 2") + result = shell_out!("mknod #{path} c 1 2") result.stderr.empty? end @@ -761,7 +761,7 @@ shared_examples_for "a configured file resource" do end before(:each) do - result = shell_out("mkfifo #{path}") + result = shell_out!("mkfifo #{path}") result.stderr.empty? end |