test/spec_webrick.rb in rack-2.0.0.alpha vs test/spec_webrick.rb in rack-2.0.0.rc1

@@ -15,12 +15,25 @@
                                     :AccessLog => [])
   @server.mount "/test", Rack::Handler::WEBrick,
     Rack::Lint.new(TestRequest.new)
   @thread = Thread.new { @server.start }
   trap(:INT) { @server.shutdown }
+  @status_thread = Thread.new do
+    seconds = 10
+    wait_time = 0.1
+    until is_running? || seconds <= 0
+      seconds -= wait_time
+      sleep wait_time
+    end
+    raise "Server never reached status 'Running'" unless is_running?
   end
+  end
 
+  def is_running?
+    @server.status == :Running
+  end
+
   it "respond" do
     GET("/test")
     status.must_equal 200
   end
 
@@ -186,9 +199,10 @@
       res.body.must_equal "chunked"
     }
   end
 
   after do
+  @status_thread.join
   @server.shutdown
   @thread.join
   end
 end