diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2017-03-31 23:21:38 -0700 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2017-03-31 23:21:38 -0700 |
commit | ad3ef0854ffd962f7d124612ee0bad18115212c5 (patch) | |
tree | 68ebfe6cb7bf8ed261e3f8b212365a1c131e6a38 | |
parent | f5ab1f1c6a8e5156e677c902ae67efb51976e3ca (diff) | |
download | chef-ad3ef0854ffd962f7d124612ee0bad18115212c5.tar.gz |
remove the specs, remove include from shell_spec
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r-- | spec/functional/shell_spec.rb | 4 | ||||
-rw-r--r-- | spec/unit/mixin/command_spec.rb | 107 |
2 files changed, 1 insertions, 110 deletions
diff --git a/spec/functional/shell_spec.rb b/spec/functional/shell_spec.rb index 8c8d7ba482..f4d8a06b52 100644 --- a/spec/functional/shell_spec.rb +++ b/spec/functional/shell_spec.rb @@ -1,6 +1,6 @@ # # Author:: Daniel DeLeo (<dan@chef.io>) -# Copyright:: Copyright 2012-2016, Chef Software, Inc. +# Copyright:: Copyright 2012-2017, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,7 +20,6 @@ require "spec_helper" require "functional/resource/base" require "chef/version" require "chef/shell" -require "chef/mixin/command/unix" describe Shell do @@ -28,7 +27,6 @@ describe Shell do # not catch cases where chef-shell fails to boot because of changes in # chef/client.rb describe "smoke tests", :unix_only => true do - include Chef::Mixin::Command::Unix TIMEOUT = 300 diff --git a/spec/unit/mixin/command_spec.rb b/spec/unit/mixin/command_spec.rb deleted file mode 100644 index e9f0dacad6..0000000000 --- a/spec/unit/mixin/command_spec.rb +++ /dev/null @@ -1,107 +0,0 @@ -# -# Author:: Hongli Lai (hongli@phusion.nl) -# Copyright:: Copyright 2009-2016, Phusion -# License:: Apache License, Version 2.0 -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -require "spec_helper" - -describe Chef::Mixin::Command, :volatile do - - if windows? - - skip("TODO MOVE: this is a platform specific integration test.") - - else - - describe "popen4" do - include Chef::Mixin::Command - - it "should be possible to read the child process's stdout and stderr" do - popen4("sh -c 'echo hello && echo world >&2'") do |pid, stdin, stdout, stderr| - expect(stdout.read).to eq("hello\n") - expect(stderr.read).to eq("world\n") - end - end - - it "should default all commands to be run in the POSIX standard C locale" do - popen4("echo $LC_ALL") do |pid, stdin, stdout, stderr| - expect(stdout.read.strip).to eq("C") - end - end - - it "should respect locale when specified explicitly" do - popen4("echo $LC_ALL", :environment => { "LC_ALL" => "es" }) do |pid, stdin, stdout, stderr| - expect(stdout.read.strip).to eq("es") - end - end - - it "should end when the child process reads from STDIN and a block is given" do - expect do - Timeout.timeout(10) do - popen4("ruby -e 'while gets; end'", :waitlast => true) do |pid, stdin, stdout, stderr| - (1..5).each { |i| stdin.puts "#{i}" } - end - end - end.not_to raise_error - end - - describe "when a process detaches but doesn't close STDOUT and STDERR [CHEF-584]" do - - it "returns immediately after the first child process exits" do - expect do - Timeout.timeout(10) do - evil_forker = "exit if fork; 10.times { sleep 1}" - popen4("ruby -e '#{evil_forker}'") do |pid, stdin, stdout, stderr| - end - end end.not_to raise_error - end - - end - - end - - describe "run_command" do - include Chef::Mixin::Command - - it "logs the command's stderr and stdout output if the command failed" do - allow(Chef::Log).to receive(:level).and_return(:debug) - begin - run_command(:command => "sh -c 'echo hello; echo world >&2; false'") - violated "Exception expected, but nothing raised." - rescue => e - expect(e.message).to match(/STDOUT: hello/) - expect(e.message).to match(/STDERR: world/) - end - end - - describe "when a process detaches but doesn't close STDOUT and STDERR [CHEF-584]" do - it "returns successfully" do - # CHEF-2916 might have added a slight delay here, or our CI - # infrastructure is burdened. Bumping timeout from 2 => 4 -- - # btm - # Serdar - During Solaris tests, we've seen that processes - # are taking a long time to exit. Bumping timeout now to 10. - expect do - Timeout.timeout(10) do - evil_forker = "exit if fork; 10.times { sleep 1}" - run_command(:command => "ruby -e '#{evil_forker}'") - end end.not_to raise_error - end - - end - end - end -end |