summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan McLellan <btm@opscode.com>2012-02-09 12:13:15 -0800
committerBryan McLellan <btm@opscode.com>2012-02-09 12:13:15 -0800
commitbfdc68e9f1212659f25daa23fd30d1f14540ae12 (patch)
treef5cfcee4298bf298137caca3765119a59e813cdc
parent8d0037418b969cc473a48a8d97faa7f9a4ab2b40 (diff)
downloadchef-bfdc68e9f1212659f25daa23fd30d1f14540ae12.tar.gz
CHEF-2916: bump timeout a bit on the popen4 test
-rw-r--r--chef/spec/unit/mixin/command_spec.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/chef/spec/unit/mixin/command_spec.rb b/chef/spec/unit/mixin/command_spec.rb
index 1d5832d7b1..d3da0e35e5 100644
--- a/chef/spec/unit/mixin/command_spec.rb
+++ b/chef/spec/unit/mixin/command_spec.rb
@@ -88,7 +88,8 @@ describe Chef::Mixin::Command do
describe "when a process detaches but doesn't close STDOUT and STDERR [CHEF-584]" do
it "returns successfully" do
- lambda {Timeout.timeout(2) do
+ # CHEF-2916 might have added a slight delay here, or our CI infrastructure is burdened. Bumping timeout from 2 => 4 -- btm
+ lambda {Timeout.timeout(4) do
evil_forker="exit if fork; 10.times { sleep 1}"
run_command(:command => "ruby -e '#{evil_forker}'")
end}.should_not raise_error