about summary refs log tree commit homepage
path: root/test
diff options
context:
space:
mode:
authorevanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9>2007-10-26 19:14:54 +0000
committerevanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9>2007-10-26 19:14:54 +0000
commit3bdf6c88b5e614a2086399d355f7483a6bf4f66b (patch)
tree18c58db69c92a02fea4ac6c3ec2c218ce76bddbf /test
parent2ad24e46f0538ffc6d86c1443f25671e417ed455 (diff)
downloadunicorn-3bdf6c88b5e614a2086399d355f7483a6bf4f66b.tar.gz
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@784 19e92222-5c0b-0410-8929-a290d50e31e9
Diffstat (limited to 'test')
-rw-r--r--test/test_redirect_handler.rb4
-rw-r--r--test/test_request_progress.rb4
-rw-r--r--test/test_ws.rb9
3 files changed, 12 insertions, 5 deletions
diff --git a/test/test_redirect_handler.rb b/test/test_redirect_handler.rb
index f970203..2e03d48 100644
--- a/test/test_redirect_handler.rb
+++ b/test/test_redirect_handler.rb
@@ -9,7 +9,9 @@ require 'test/testhelp'
 class RedirectHandlerTest < Test::Unit::TestCase
 
   def setup
-    @server = Mongrel::HttpServer.new('127.0.0.1', 9998)
+    redirect_test_io do
+      @server = Mongrel::HttpServer.new('127.0.0.1', 9998)
+    end
     @server.run
     @client = Net::HTTP.new('127.0.0.1', 9998)
   end
diff --git a/test/test_request_progress.rb b/test/test_request_progress.rb
index e980173..ba21c27 100644
--- a/test/test_request_progress.rb
+++ b/test/test_request_progress.rb
@@ -38,7 +38,9 @@ end
 
 class RequestProgressTest < Test::Unit::TestCase
   def setup
-    @server = Mongrel::HttpServer.new("127.0.0.1", 9998)
+    redirect_test_io do
+      @server = Mongrel::HttpServer.new("127.0.0.1", 9998)
+    end
     @handler = UploadBeginHandler.new
     @server.register("/upload", @handler)
     @server.run
diff --git a/test/test_ws.rb b/test/test_ws.rb
index 33981c6..7aa6db5 100644
--- a/test/test_ws.rb
+++ b/test/test_ws.rb
@@ -22,9 +22,12 @@ 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"
-
-    # We set num_processors=1 so that we can test the reaping code
-    @server = HttpServer.new("127.0.0.1", 9998, num_processors=1)
+    
+    redirect_test_io do
+      # We set num_processors=1 so that we can test the reaping code
+      @server = HttpServer.new("127.0.0.1", 9998, num_processors=1)
+    end
+    
     @tester = TestHandler.new
     @server.register("/test", @tester)
     redirect_test_io do