From 5988d8cbd5be141ccb9e6516785dae6be80c724e Mon Sep 17 00:00:00 2001 From: arton Date: Mon, 28 Mar 2011 16:52:20 +0000 Subject: [PATCH] * test/webrick/test_filehandler.rb (test_short_filename): read real short filename by cmd because smb mounted files have different naming convention. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31205 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/webrick/test_filehandler.rb | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ce11b7c09..3f2bb5eb73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Mar 29 00:03:51 2011 Tajima Akil + + * test/webrick/test_filehandler.rb (test_short_filename): + read real short filename by cmd because smb mounted files + have different naming convention. + Mon Mar 28 11:38:08 2011 NARUSE, Yui * ext/date/date_core.c (date_s_today): use int for year. diff --git a/test/webrick/test_filehandler.rb b/test/webrick/test_filehandler.rb index e4b672af8d..fdb2d8a7e2 100644 --- a/test/webrick/test_filehandler.rb +++ b/test/webrick/test_filehandler.rb @@ -216,8 +216,12 @@ class WEBrick::TestFileHandler < Test::Unit::TestCase } TestWEBrick.start_httpserver(config) do |server, addr, port, log| http = Net::HTTP.new(addr, port) - - req = Net::HTTP::Get.new("/webric~1.cgi/test") + if windows? + fname = IO.popen("dir /x webrick_long_filename.cgi", "r").read.match(/\s(w.+?cgi)\s/i)[1].downcase + else + fname = "webric~1.cgi" + end + req = Net::HTTP::Get.new("/#{fname}/test") http.request(req) do |res| if windows? assert_equal("200", res.code, log.call)