Fix tests to at least run and finish on 1.9.2

spec/backends/swiftiply_client_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Backends::SwiftiplyClient do
   before do

spec/backends/tcp_server_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Backends::TcpServer do
   before do

spec/backends/unix_server_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Backends::UnixServer do
   before do

spec/command_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Command do
   before do

spec/connection_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Connection do
   before do

spec/controllers/cluster_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 include Controllers
 
 describe Cluster, "with host and port" do

spec/controllers/controller_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'ostruct'
 include Controllers
 

spec/controllers/service_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 include Controllers
 
 describe Service do

spec/daemonizing_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 class TestServer
   include Logging # Daemonizable should include this?
@@ -87,8 +87,10 @@ def name
 
     @pid = @server.pid
 
-    silence_stream STDOUT do
-      TestServer.kill(@server.pid_file, 1)
+    timeout(10) do
+      silence_stream STDOUT do
+        TestServer.kill(@server.pid_file, 1)
+      end
     end
 
     File.exist?(@server.pid_file).should be_false
@@ -104,8 +106,10 @@ def name
 
     @pid = @server.pid
 
-    silence_stream STDOUT do
-      TestServer.kill(@server.pid_file, 0)
+    timeout(10) do
+      silence_stream STDOUT do
+        TestServer.kill(@server.pid_file, 0)
+      end
     end
 
     File.exist?(@server.pid_file).should be_false
@@ -193,4 +197,4 @@ def name
     def server_should_start_in_less_then(sec=10)
       proc { sleep 0.1 until File.exist?(@server.pid_file) }.should take_less_then(10)
     end
-end
+end

spec/headers_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Headers do
   before do

spec/logging_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 class TestLogging
   include Logging

spec/perf/request_perf_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Request, 'performance' do
   it "should be faster then #{max_parsing_time = 0.0002} RubySeconds" do

spec/perf/response_perf_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Response, 'performance' do
   before do

spec/perf/server_perf_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Server, 'performance' do
   before do

spec/rack/loader_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Rack::Adapter do
   before do

spec/rack/rails_adapter_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'rack/mock'
 
 begin

spec/request/mongrel_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'digest/sha1'
 
 describe Request, 'legacy Mongrel tests' do

spec/request/parser_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 # Require mongrel so we can test that Thin parser don't clash w/ Mongrel parser.
 begin

spec/request/persistent_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Request, 'persistent' do
   before do

spec/request/processing_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Request, 'processing' do
   it 'should parse in chunks' do

spec/response_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Response do
   before do

spec/runner_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Runner do
   it "should parse options" do

spec/server/builder_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Server, 'app builder' do
   it "should build app from constructor" do

spec/server/pipelining_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Server, "HTTP pipelining" do
   before do
@@ -35,7 +35,7 @@
     socket.close
 
     wait_for_requests_to_complete!
-    
+
     response.should include('/first-1', '/second-2')
   end
 
@@ -107,4 +107,4 @@
     def wait_for_requests_to_complete!
       sleep 0.1 until @server.backend.size == 0
     end
-end
+end

spec/server/robustness_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Server, 'robustness' do
   before do

spec/server/stopping_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Server, "stopping" do
   before do

spec/server/swiftiply_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 if SWIFTIPLY_PATH.empty?
   warn "Ignoring Server on Swiftiply specs, gem install swiftiply to run"

spec/server/tcp_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Server, 'on TCP socket' do
   before do

spec/server/threaded_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Server, 'with threads' do
   before do
@@ -24,4 +24,4 @@
   after do
     stop_server
   end
-end
+end

spec/server/unix_socket_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Server, "on UNIX domain socket" do
   before do

spec/server_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Server do
   before do

spec/spec_helper.rb

@@ -153,13 +153,19 @@ def start_server(address=DEFAULT_TEST_ADDRESS, port=DEFAULT_TEST_PORT, options={
       wait_for_socket(address, port)
     else
       # If we can't ping the address fallback to just wait for the server to run
-      sleep 1 until @server.running?
+      sleep 0.01 until @server.running?
     end
   end
 
   def stop_server
     @server.stop!
     @thread.kill
+
+    100.times do
+      break unless EM.reactor_running?
+      sleep 0.01
+    end
+
     raise "Reactor still running, wtf?" if EventMachine.reactor_running?
   end
 
@@ -217,4 +223,4 @@ def post(url, params={})
 Spec::Runner.configure do |config|
   config.include Matchers
   config.include Helpers
-end
+end

tasks/spec.rake

@@ -19,7 +19,6 @@ SPECS      = FileList['spec/**/*_spec.rb'] - PERF_SPECS - SPECS2
 
 def spec_task(name, specs)
   Spec::Rake::SpecTask.new(name) do |t|
-    t.libs << 'lib'
     t.spec_opts = %w(-fs -c)
     t.spec_files = specs
   end
@@ -41,4 +40,4 @@ task :check_benchmark_unit_gem do
   end
 end
 
-task 'spec:perf' => :check_benchmark_unit_gem
+task 'spec:perf' => :check_benchmark_unit_gem