From 52047a145bc88dfa48f1bc13409aa714cd87ce19 Mon Sep 17 00:00:00 2001 From: usa Date: Sun, 6 Dec 2015 09:28:02 +0000 Subject: [PATCH] * test/webrick/test_cgi.rb (TestWEBrickCGI#test_cgi): gave up the test of binary path info test on Windows because the test had passed occasionally as the comment said. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52905 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/webrick/test_cgi.rb | 9 ++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 575f121a1e..d4f42da23a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Dec 6 18:25:22 2015 NAKAMURA Usaku + + * test/webrick/test_cgi.rb (TestWEBrickCGI#test_cgi): gave up the test + of binary path info test on Windows because the test had passed + occasionally as the comment said. + Sun Dec 6 15:25:06 2015 Nobuyoshi Nakada * ext/io/console/console.c (console_getpass): add IO#getpass diff --git a/test/webrick/test_cgi.rb b/test/webrick/test_cgi.rb index 5507dfec41..b9d066175f 100644 --- a/test/webrick/test_cgi.rb +++ b/test/webrick/test_cgi.rb @@ -37,11 +37,10 @@ class TestWEBrickCGI < Test::Unit::TestCase http.request(req){|res| assert_equal("/path/info", res.body, log.call)} req = Net::HTTP::Get.new("/webrick.cgi/%3F%3F%3F?foo=bar") http.request(req){|res| assert_equal("/???", res.body, log.call)} - req = Net::HTTP::Get.new("/webrick.cgi/%A4%DB%A4%B2/%A4%DB%A4%B2") - # Path info of res.body is passed via ENV. - # ENV[] returns different value on Windows depending on locale. - unless RUBY_PLATFORM =~ /mswin|mingw|cygwin|bccwin32/ && - Encoding.find("locale") != Encoding.find("filesystem") + unless RUBY_PLATFORM =~ /mswin|mingw|cygwin|bccwin32/ + # Path info of res.body is passed via ENV. + # ENV[] returns different value on Windows depending on locale. + req = Net::HTTP::Get.new("/webrick.cgi/%A4%DB%A4%B2/%A4%DB%A4%B2") http.request(req){|res| assert_equal("/\xA4\xDB\xA4\xB2/\xA4\xDB\xA4\xB2", res.body, log.call)} end