summaryrefslogtreecommitdiff
path: root/spec/tiny_server.rb
diff options
context:
space:
mode:
authorLamont Granquist <lamont@opscode.com>2013-01-10 14:11:00 -0800
committerLamont Granquist <lamont@opscode.com>2013-01-10 14:11:00 -0800
commit841a8c363e1073f0509586ba917bf61d9af171e6 (patch)
tree1670b726bc1ab02e078ddf9b1c36c62291b88a4c /spec/tiny_server.rb
parenteac339b9b3b17f08724320601ec67db1f95d368e (diff)
downloadchef-841a8c363e1073f0509586ba917bf61d9af171e6.tar.gz
race condition that resolves itself?
Diffstat (limited to 'spec/tiny_server.rb')
-rw-r--r--spec/tiny_server.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/tiny_server.rb b/spec/tiny_server.rb
index ba75cd57c1..9eecf13cec 100644
--- a/spec/tiny_server.rb
+++ b/spec/tiny_server.rb
@@ -77,11 +77,11 @@ module TinyServer
def block_until_started
200.times do
- if started?
- raise "ivar weirdness" if @server.nil?
+ if started? && !@server.nil?
return true
end
end
+ raise "ivar weirdness" if started? && @server.nil?
raise "TinyServer failed to boot :/"
end