summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/mixlib/shellout/unix.rb2
-rw-r--r--spec/mixlib/shellout_spec.rb10
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/mixlib/shellout/unix.rb b/lib/mixlib/shellout/unix.rb
index 8032cf1..b8f4a17 100644
--- a/lib/mixlib/shellout/unix.rb
+++ b/lib/mixlib/shellout/unix.rb
@@ -351,7 +351,7 @@ module Mixlib
Process.kill(:TERM, child_pgid)
sleep 3
attempt_reap
- logger.error("Command execeded allowed execution time, sending KILL") if logger
+ logger.error("Command exceeded allowed execution time, sending KILL") if logger
Process.kill(:KILL, child_pgid)
reap
diff --git a/spec/mixlib/shellout_spec.rb b/spec/mixlib/shellout_spec.rb
index 277393b..5dcb6a7 100644
--- a/spec/mixlib/shellout_spec.rb
+++ b/spec/mixlib/shellout_spec.rb
@@ -927,8 +927,8 @@ describe Mixlib::ShellOut do
shell_cmd.stdout.should include("nanana cant hear you")
shell_cmd.status.termsig.should == 9
- log_output.string.should include("Command execeded allowed execution time, sending TERM")
- log_output.string.should include("Command execeded allowed execution time, sending KILL")
+ log_output.string.should include("Command exceeded allowed execution time, sending TERM")
+ log_output.string.should include("Command exceeded allowed execution time, sending KILL")
end
end
@@ -1030,7 +1030,7 @@ describe Mixlib::ShellOut do
let(:ruby_code) { "STDIN.close; sleep 0.5; STDOUT.puts :win" }
let(:options) { { :input => "Random data #{rand(100000)}" } }
- it 'should not hang or lose outupt' do
+ it 'should not hang or lose output' do
stdout.should eql("win#{LINE_ENDING}")
end
end
@@ -1038,7 +1038,7 @@ describe Mixlib::ShellOut do
context 'with subprocess that closes stdout and continues writing to stderr' do
let(:ruby_code) { "STDOUT.close; sleep 0.5; STDERR.puts :win" }
- it 'should not hang or lose outupt' do
+ it 'should not hang or lose output' do
stderr.should eql("win#{LINE_ENDING}")
end
end
@@ -1046,7 +1046,7 @@ describe Mixlib::ShellOut do
context 'with subprocess that closes stderr and continues writing to stdout' do
let(:ruby_code) { "STDERR.close; sleep 0.5; STDOUT.puts :win" }
- it 'should not hang or lose outupt' do
+ it 'should not hang or lose output' do
stdout.should eql("win#{LINE_ENDING}")
end
end