Merge pull request #580 from opscode/lcg/tiny-server-race

race condition that resolves itself?

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