summaryrefslogtreecommitdiff
path: root/test/ruby/test_encoding.rb
diff options
context:
space:
mode:
Diffstat (limited to 'test/ruby/test_encoding.rb')
-rw-r--r--test/ruby/test_encoding.rb17
1 files changed, 4 insertions, 13 deletions
diff --git a/test/ruby/test_encoding.rb b/test/ruby/test_encoding.rb
index 019cb2417f..8f73a8fce1 100644
--- a/test/ruby/test_encoding.rb
+++ b/test/ruby/test_encoding.rb
@@ -34,6 +34,9 @@ class TestEncoding < Test::Unit::TestCase
assert_raise(TypeError) { e.dup }
assert_raise(TypeError) { e.clone }
assert_equal(e.object_id, Marshal.load(Marshal.dump(e)).object_id)
+ assert_not_predicate(e, :tainted?)
+ Marshal.load(Marshal.dump(e).taint)
+ assert_not_predicate(e, :tainted?, '[ruby-core:71793] [Bug #11760]')
end
end
@@ -117,21 +120,9 @@ class TestEncoding < Test::Unit::TestCase
assert_separately(%w[--disable=gems], "#{<<~"begin;"}\n#{<<~'end;'}")
bug9038 = '[ruby-core:57949] [Bug #9038]'
begin;
- e = assert_raise_with_message(SyntaxError, /unknown regexp option - Q/, bug9038) {
+ assert_raise_with_message(SyntaxError, /unknown regexp option - Q/, bug9038) {
eval("/regexp/sQ")
}
- assert_include(e.message, "/regexp/sQ\n")
- end;
- end
-
- def test_nonascii_library_path
- assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}".force_encoding("US-ASCII"))
- begin;
- assert_equal(Encoding::US_ASCII, __ENCODING__)
- $:.unshift("/\x80")
- assert_raise_with_message(LoadError, /\[Bug #16382\]/) do
- $:.resolve_feature_path "[Bug #16382]"
- end
end;
end
end