diff --git a/test/test_handlers.rb b/test/test_handlers.rb index 1005dd05..1c331921 100644 --- a/test/test_handlers.rb +++ b/test/test_handlers.rb @@ -49,17 +49,17 @@ class HandlersTest < Test::Unit::TestCase uri "/relative", :handler => Mongrel::DirHandler.new(nil, listing_allowed=false, index_html="none") end end - - File.open("/tmp/testfile", 'w') do - # Do nothing + + unless windows? + File.open("/tmp/testfile", 'w') { } # Do nothing end - + @config.run end def teardown @config.stop(false, true) - File.delete "/tmp/testfile" + File.delete "/tmp/testfile" unless windows? end def test_more_web_server @@ -74,10 +74,12 @@ class HandlersTest < Test::Unit::TestCase ]) check_status res, String end - + def test_nil_dirhandler + return if windows? + # Camping uses this internally - handler = Mongrel::DirHandler.new(nil, false) + handler = Mongrel::DirHandler.new(nil, false) assert handler.can_serve("/tmp/testfile") # Not a bug! A nil @file parameter is the only circumstance under which # we are allowed to serve any existing file diff --git a/test/testhelp.rb b/test/testhelp.rb index 42ead2c9..f4d1a3c8 100644 --- a/test/testhelp.rb +++ b/test/testhelp.rb @@ -64,3 +64,8 @@ def hit(uris) return results end + +# Platform check helper ;-) +def windows? + result = RUBY_PLATFORM =~ /mingw|mswin/ +end