diff options
author | evanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9> | 2007-10-20 23:15:19 +0000 |
---|---|---|
committer | evanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9> | 2007-10-20 23:15:19 +0000 |
commit | fab6173a056990b3c3ed5756ac0624654bb6308f (patch) | |
tree | e8e899f002b82fce6179d7873b6f170f1cdacbc3 /test/test_configurator.rb | |
parent | 38f36eb891b93547025f2ff60e861de72843663f (diff) | |
download | unicorn-fab6173a056990b3c3ed5756ac0624654bb6308f.tar.gz |
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@705 19e92222-5c0b-0410-8929-a290d50e31e9
Diffstat (limited to 'test/test_configurator.rb')
-rw-r--r-- | test/test_configurator.rb | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/test/test_configurator.rb b/test/test_configurator.rb index d8e9a11..50e5037 100644 --- a/test/test_configurator.rb +++ b/test/test_configurator.rb @@ -4,10 +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' $test_plugin_fired = 0 @@ -32,10 +29,10 @@ end class ConfiguratorTest < Test::Unit::TestCase def test_base_handler_config - config = nil + @config = nil redirect_test_io do - config = Mongrel::Configurator.new :host => "localhost" do + @config = Mongrel::Configurator.new :host => "localhost" do listener :port => 4501 do # 2 in front should run, but the sentinel shouldn't since dirhandler processes the request uri "/", :handler => plugin("/handlers/testplugin") @@ -60,7 +57,7 @@ class ConfiguratorTest < Test::Unit::TestCase end - config.listeners.each do |host,listener| + @config.listeners.each do |host,listener| assert listener.classifier.uris.length == 3, "Wrong number of registered URIs" assert listener.classifier.uris.include?("/"), "/ not registered" assert listener.classifier.uris.include?("/test"), "/test not registered" @@ -78,7 +75,7 @@ class ConfiguratorTest < Test::Unit::TestCase end redirect_test_io do - config.stop(false, true) + @config.stop(false, true) end assert_raise Errno::EBADF, Errno::ECONNREFUSED do |