From 0a733176da0b8566d39cdabf8f0d2043a0a93cb0 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 3 Jun 2017 09:18:44 +0000 Subject: test_require.rb: untouch default internal encoding * test/ruby/test_require.rb (assert_require_insecure_path): get rid of setting Encoding.default_internal, which affects load path conversion. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59004 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_require.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb index 12c6ba9891..41173b002d 100644 --- a/test/ruby/test_require.rb +++ b/test/ruby/test_require.rb @@ -162,11 +162,14 @@ class TestRequire < Test::Unit::TestCase File.chmod(0777, File.dirname(require_path)) ospath = (require_path.encode('filesystem') rescue require_path.encode(self.class.ospath_encoding(require_path))) - assert_warn(/Insecure world writable dir/) do - assert_raise_with_message(SecurityError, "loading from unsafe path #{ospath}") do + e = nil + stderr = EnvUtil.verbose_warning do + e = assert_raise(SecurityError) do SECURITY_WARNING.call(require_path) end end + assert_include(e.message, "loading from unsafe path") + assert_include(stderr, "Insecure world writable dir") } end -- cgit v1.2.3