summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2015-12-10 11:36:49 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2015-12-10 11:36:49 -0800
commit8977c2bf838b99e48d643bde72c6cd8264796334 (patch)
tree2b856e47c5c2c1c85c9fe62866e7f00f15c22492
parent68f298faeec0f66e2bbd4e8ebfcb26ec1008b82e (diff)
parent8c1cb10eb7f6d02504c52971e2ddfd3061e7a2a4 (diff)
downloadchef-8977c2bf838b99e48d643bde72c6cd8264796334.tar.gz
Merge pull request #4270 from chef/lcg/rspec-timeouts
fix rspec timeouts in tinyserver
-rw-r--r--spec/tiny_server.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/tiny_server.rb b/spec/tiny_server.rb
index c28fdc30b3..77afde68e1 100644
--- a/spec/tiny_server.rb
+++ b/spec/tiny_server.rb
@@ -96,7 +96,7 @@ module TinyServer
sleep 0.1
# If the host has ":::1 localhost" in its hosts file and if IPv6
# is not enabled we can get NetworkUnreachable exception...
- rescue Errno::ENETUNREACH => e
+ rescue Errno::ENETUNREACH, Net::ReadTimeout, IO::EAGAINWaitReadable => e
sleep 0.1
false
end