same

git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@711 19e92222-5c0b-0410-8929-a290d50e31e9

2 files changed, 54 insertions, 63 deletions

diff --git a/test/test_request_progress.rb b/test/test_request_progress.rb
index a1bf1ec..e980173 100644
--- a/test/test_request_progress.rb
+++ b/test/test_request_progress.rb
@@ -4,11 +4,7 @@
 # Additional work donated by contributors.  See http://mongrel.rubyforge.org/attributions.html 
 # for more information.
 
-require 'test/unit'
-require 'mongrel'
-require 'net/http'
-require File.dirname(__FILE__) + '/testhelp.rb'
-
+require 'test/testhelp'
 
 class UploadBeginHandler < Mongrel::HttpHandler
   attr_reader :request_began, :request_progressed, :request_processed
diff --git a/test/testhelp.rb b/test/testhelp.rb
index 5d89c11..f6f37df 100644
--- a/test/testhelp.rb
+++ b/test/testhelp.rb
@@ -4,67 +4,62 @@
 # Additional work donated by contributors.  See http://mongrel.rubyforge.org/attributions.html 
 # for more information.
 
-unless defined? $require_once
 
-  $require_once = true
+HERE = File.dirname(__FILE__)
+%w(lib ext bin test).each do |dir| 
+  $LOAD_PATH.unshift "#{HERE}/../#{dir}"
+end
 
-  HERE = File.dirname(__FILE__)
-  %w(lib ext bin test).each do |dir| 
-    $LOAD_PATH.unshift "#{HERE}/../#{dir}"
-  end
-  
-  require 'rubygems'
-  require 'test/unit'
-  require 'net/http'
-  require 'timeout'
-  require 'cgi/session'
-  require 'fileutils'
-  require 'benchmark'
-  require 'digest/sha1'
-  require 'uri'
-  require 'stringio'
-  
-  require 'mongrel'
-  require 'mongrel/stats'
-  
-  if ENV['DEBUG']
-    require 'ruby-debug'
-    Debugger.start
-  end
-  
-  def redirect_test_io
-    orig_err = STDERR.dup
-    orig_out = STDOUT.dup
-    STDERR.reopen("test_stderr.log")
-    STDOUT.reopen("test_stdout.log")
-  
-    begin
-      yield
-    ensure
-      STDERR.reopen(orig_err)
-      STDOUT.reopen(orig_out)
-    end
+require 'rubygems'
+require 'test/unit'
+require 'net/http'
+require 'timeout'
+require 'cgi/session'
+require 'fileutils'
+require 'benchmark'
+require 'digest/sha1'
+require 'uri'
+require 'stringio'
+
+require 'mongrel'
+require 'mongrel/stats'
+
+if ENV['DEBUG']
+  require 'ruby-debug'
+  Debugger.start
+end
+
+def redirect_test_io
+  orig_err = STDERR.dup
+  orig_out = STDOUT.dup
+  STDERR.reopen("test_stderr.log")
+  STDOUT.reopen("test_stdout.log")
+
+  begin
+    yield
+  ensure
+    STDERR.reopen(orig_err)
+    STDOUT.reopen(orig_out)
   end
-     
-  # Either takes a string to do a get request against, or a tuple of [URI, HTTP] where
-  # HTTP is some kind of Net::HTTP request object (POST, HEAD, etc.)
-  def hit(uris)
-    results = []
-    uris.each do |u|
-      res = nil
-  
-      if u.kind_of? String
-        res = Net::HTTP.get(URI.parse(u))
-      else
-        url = URI.parse(u[0])
-        res = Net::HTTP.new(url.host, url.port).start {|h| h.request(u[1]) }
-      end
-  
-      assert res != nil, "Didn't get a response: #{u}"
-      results << res
+end
+    
+# Either takes a string to do a get request against, or a tuple of [URI, HTTP] where
+# HTTP is some kind of Net::HTTP request object (POST, HEAD, etc.)
+def hit(uris)
+  results = []
+  uris.each do |u|
+    res = nil
+
+    if u.kind_of? String
+      res = Net::HTTP.get(URI.parse(u))
+    else
+      url = URI.parse(u[0])
+      res = Net::HTTP.new(url.host, url.port).start {|h| h.request(u[1]) }
     end
-  
-    return results
+
+    assert res != nil, "Didn't get a response: #{u}"
+    results << res
   end
-  
+
+  return results
 end