about summary refs log tree commit homepage
path: root/test
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2009-02-06 15:54:00 -0800
committerEric Wong <normalperson@yhbt.net>2009-02-09 19:50:57 -0800
commitb1346861133517b939684d2e6eb62ef694b1062f (patch)
tree1d8e0c4ecb82f05bbbff12831e03df82ac5c769b /test
parentf07a1c59be7f7b41bf3216f6e67add05d0f04d02 (diff)
downloadunicorn-b1346861133517b939684d2e6eb62ef694b1062f.tar.gz
While we'll support anything that exposes a Rack-like interface
(a very good one IMHO), we shouldn't have a hard dependency on
Rack to simplify testing.

While we're at it, I'm not using Daemons anymore, either,
since that does too many things behind our back as far as
daemonization goes.

As a result of not depending on Rubygems, either, I've sped
up my "make -j" test ~1.5 seconds
Diffstat (limited to 'test')
-rw-r--r--test/test_helper.rb2
-rw-r--r--test/unit/test_server.rb5
2 files changed, 2 insertions, 5 deletions
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 21d9e81..ae4f178 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -20,8 +20,6 @@ require 'digest/sha1'
 require 'uri'
 require 'stringio'
 require 'pp'
-require 'rubygems'
-
 require 'unicorn'
 
 if ENV['DEBUG']
diff --git a/test/unit/test_server.rb b/test/unit/test_server.rb
index ae8f5b8..e9bd487 100644
--- a/test/unit/test_server.rb
+++ b/test/unit/test_server.rb
@@ -22,10 +22,9 @@ class WebServerTest < Test::Unit::TestCase
   def setup
     @valid_request = "GET / HTTP/1.1\r\nHost: www.zedshaw.com\r\nContent-Type: text/plain\r\n\r\n"
     @port = process_based_port
-    @tester = TestHandler.new
-    @app = Rack::URLMap.new('/test' => @tester)
+    @tester = TestHandler.new
     redirect_test_io do
-      @server = HttpServer.new(@app, :listeners => [ "127.0.0.1:#{@port}" ] )
+      @server = HttpServer.new(@tester, :listeners => [ "127.0.0.1:#{@port}" ] )
     end
     @server.start
   end