summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/net/ftp/test_ftp.rb3
-rw-r--r--test/objspace/test_objspace.rb2
-rw-r--r--test/ruby/test_ast.rb4
-rw-r--r--test/ruby/test_eval.rb1
-rw-r--r--test/ruby/test_flip.rb3
-rw-r--r--test/ruby/test_gc.rb1
-rw-r--r--test/ruby/test_gc_compact.rb2
-rw-r--r--test/ruby/test_iseq.rb2
-rw-r--r--test/ruby/test_literal.rb2
-rw-r--r--test/ruby/test_m17n.rb2
-rw-r--r--test/ruby/test_optimization.rb1
-rw-r--r--test/ruby/test_parse.rb4
-rw-r--r--test/ruby/test_proc.rb2
-rw-r--r--test/ruby/test_refinement.rb2
-rw-r--r--test/socket/test_socket.rb1
-rw-r--r--test/test_open3.rb1
16 files changed, 25 insertions, 8 deletions
diff --git a/test/net/ftp/test_ftp.rb b/test/net/ftp/test_ftp.rb
index a521964..39f1220 100644
--- a/test/net/ftp/test_ftp.rb
+++ b/test/net/ftp/test_ftp.rb
@@ -530,6 +530,7 @@ class FTPTest < Test::Unit::TestCase
sock.print("553 Requested action not taken.\r\n")
commands.push(sock.gets)
sock.print("200 Switching to Binary mode.\r\n")
+ [host, port]
}
begin
begin
@@ -711,6 +712,7 @@ class FTPTest < Test::Unit::TestCase
host, port = process_port_or_eprt(sock, line)
commands.push(sock.gets)
sock.print("550 Requested action not taken.\r\n")
+ [host, port]
}
begin
begin
@@ -937,6 +939,7 @@ class FTPTest < Test::Unit::TestCase
host, port = process_port_or_eprt(sock, line)
commands.push(sock.gets)
sock.print("452 Requested file action aborted.\r\n")
+ [host, port]
}
begin
begin
diff --git a/test/objspace/test_objspace.rb b/test/objspace/test_objspace.rb
index 833b372..336b30f 100644
--- a/test/objspace/test_objspace.rb
+++ b/test/objspace/test_objspace.rb
@@ -106,7 +106,7 @@ class TestObjSpace < Test::Unit::TestCase
end
def test_memsize_of_iseq
- iseqw = RubyVM::InstructionSequence.compile('def a; a = :b; end')
+ iseqw = RubyVM::InstructionSequence.compile('def a; a = :b; a; end')
base_obj_size = ObjectSpace.memsize_of(Object.new)
assert_operator(ObjectSpace.memsize_of(iseqw), :>, base_obj_size)
end
diff --git a/test/ruby/test_ast.rb b/test/ruby/test_ast.rb
index e7826537..9598aa7 100644
--- a/test/ruby/test_ast.rb
+++ b/test/ruby/test_ast.rb
@@ -205,9 +205,9 @@ class TestAst < Test::Unit::TestCase
end
def test_scope_local_variables
- node = RubyVM::AbstractSyntaxTree.parse("x = 0")
+ node = RubyVM::AbstractSyntaxTree.parse("_x = 0")
lv, _, body = *node.children
- assert_equal([:x], lv)
+ assert_equal([:_x], lv)
assert_equal(:LASGN, body.type)
end
diff --git a/test/ruby/test_eval.rb b/test/ruby/test_eval.rb
index 8900b4f..49bb330 100644
--- a/test/ruby/test_eval.rb
+++ b/test/ruby/test_eval.rb
@@ -345,6 +345,7 @@ class TestEval < Test::Unit::TestCase
# assert_equal(1, eval("foo11"))
assert_equal(eval("foo22"), eval("foo22", p))
assert_equal(55, eval("foo22"))
+ assert_equal(55, foo22)
}.call
end
diff --git a/test/ruby/test_flip.rb b/test/ruby/test_flip.rb
index 8ea6416..9156be0 100644
--- a/test/ruby/test_flip.rb
+++ b/test/ruby/test_flip.rb
@@ -29,7 +29,7 @@ class TestFlip < Test::Unit::TestCase
assert_nothing_raised(NotImplementedError, bug6899) do
2000.times {eval %[(foo..bar) ? 1 : 2]}
end
- foo = bar
+ [foo, bar]
end
def test_shared_eval
@@ -38,6 +38,7 @@ class TestFlip < Test::Unit::TestCase
eval("vs.select {|n| if n==2..n==16 then 1 end}")
v = eval("vs.select {|n| if n==3..n==6 then 1 end}")
assert_equal([*3..6], v, bug7671)
+ vs
end
def test_shared_thread
diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb
index b5fb532..c63ef51 100644
--- a/test/ruby/test_gc.rb
+++ b/test/ruby/test_gc.rb
@@ -17,6 +17,7 @@ class TestGc < Test::Unit::TestCase
1.upto(10000) {
tmp = [0,1,2,3,4,5,6,7,8,9]
}
+ tmp
end
l=nil
100000.times {
diff --git a/test/ruby/test_gc_compact.rb b/test/ruby/test_gc_compact.rb
index 94acbb3..4228cee 100644
--- a/test/ruby/test_gc_compact.rb
+++ b/test/ruby/test_gc_compact.rb
@@ -119,6 +119,8 @@ class TestGCCompact < Test::Unit::TestCase
collisions = GC.stat(:object_id_collisions)
skip "couldn't get objects to collide" if collisions == 0
assert_operator collisions, :>, 0
+ ids.clear
+ new_tenants.clear
end
def test_complex_hash_keys
diff --git a/test/ruby/test_iseq.rb b/test/ruby/test_iseq.rb
index ac3f9a3..f10a665 100644
--- a/test/ruby/test_iseq.rb
+++ b/test/ruby/test_iseq.rb
@@ -452,7 +452,7 @@ class TestISeq < Test::Unit::TestCase
class B
2.times {
def self.foo
- a = 'good day'
+ _a = 'good day'
raise
rescue
'dear reader'
diff --git a/test/ruby/test_literal.rb b/test/ruby/test_literal.rb
index 3f5acde..3f87f86 100644
--- a/test/ruby/test_literal.rb
+++ b/test/ruby/test_literal.rb
@@ -187,7 +187,7 @@ class TestRubyLiteral < Test::Unit::TestCase
if defined?(RubyVM::InstructionSequence.compile_option) and
RubyVM::InstructionSequence.compile_option.key?(:debug_frozen_string_literal)
def test_debug_frozen_string
- src = 'n = 1; "foo#{n ? "-#{n}" : ""}"'; f = "test.rb"; n = 1
+ src = 'n = 1; _="foo#{n ? "-#{n}" : ""}"'; f = "test.rb"; n = 1
opt = {frozen_string_literal: true, debug_frozen_string_literal: true}
str = RubyVM::InstructionSequence.compile(src, f, f, n, opt).eval
assert_equal("foo-1", str)
diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb
index 75daf61..953f641 100644
--- a/test/ruby/test_m17n.rb
+++ b/test/ruby/test_m17n.rb
@@ -615,6 +615,8 @@ class TestM17N < Test::Unit::TestCase
r1 = Regexp.new('\xa1'.force_encoding("ascii-8bit"))
r2 = eval('/\xa1#{r1}/'.force_encoding('ascii-8bit'))
assert_equal(Encoding::ASCII_8BIT, r2.encoding)
+
+ [r1, r2]
end
def test_regexp_named_class
diff --git a/test/ruby/test_optimization.rb b/test/ruby/test_optimization.rb
index 5f36077..1a7d628 100644
--- a/test/ruby/test_optimization.rb
+++ b/test/ruby/test_optimization.rb
@@ -751,6 +751,7 @@ class TestRubyOptimization < Test::Unit::TestCase
h = {}
assert_equal(bug, eval('{ok: 42, **h}; bug'))
assert_equal(:ok, eval('{ok: bug = :ok, **h}; bug'))
+ assert_empty(h)
end
def test_overwritten_blockparam
diff --git a/test/ruby/test_parse.rb b/test/ruby/test_parse.rb
index b63f170..287c835 100644
--- a/test/ruby/test_parse.rb
+++ b/test/ruby/test_parse.rb
@@ -481,6 +481,7 @@ class TestParse < Test::Unit::TestCase
t[42, &blk] ||= t.dummy 42 # command_asgn test
END
assert_equal([:aref, :aset], a)
+ blk
end
def test_backquote
@@ -1148,7 +1149,7 @@ x = __ENCODING__
end
o.instance_eval {i (-1.3).abs}
assert_equal(1.3, o.x)
- o.instance_eval {i = 0; i (-1.3).abs}
+ o.instance_eval {i = 0; i (-1.3).abs; i}
assert_equal(1.3, o.x)
end
@@ -1157,6 +1158,7 @@ x = __ENCODING__
$VERBOSE = true
x = 1
eval("if false; 0 < x < 2; end")
+ x
end
end
diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb
index 17def93..bc27011 100644
--- a/test/ruby/test_proc.rb
+++ b/test/ruby/test_proc.rb
@@ -1302,7 +1302,7 @@ class TestProc < Test::Unit::TestCase
def test_local_variables
b = get_binding
assert_equal(%i'if case when begin end a', b.local_variables)
- a = tap {|;x, y| x = y; break binding.local_variables}
+ a = tap {|;x, y| x = y = x; break binding.local_variables}
assert_equal(%i[a b x y], a.sort)
end
diff --git a/test/ruby/test_refinement.rb b/test/ruby/test_refinement.rb
index 59029de..afb4784 100644
--- a/test/ruby/test_refinement.rb
+++ b/test/ruby/test_refinement.rb
@@ -1562,6 +1562,7 @@ class TestRefinement < Test::Unit::TestCase
undef :foo
end
end
+ ext
end
def test_call_refined_method_in_duplicate_module
@@ -2291,6 +2292,7 @@ class TestRefinement < Test::Unit::TestCase
end
end
assert_equal("[C[A[B]]]", c.new.foo, '[ruby-dev:50390] [Bug #14232]')
+ d
end
private
diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb
index e07c1d6..6cbf3ed 100644
--- a/test/socket/test_socket.rb
+++ b/test/socket/test_socket.rb
@@ -736,6 +736,7 @@ class TestSocket < Test::Unit::TestCase
ret, addr, rflags = s1.recvmsg(10, 0)
assert_equal "b" * 10, ret
assert_equal Socket::MSG_TRUNC, rflags & Socket::MSG_TRUNC if !rflags.nil?
+ addr
ensure
s1.close
s2.close
diff --git a/test/test_open3.rb b/test/test_open3.rb
index 848f70b..24bd08e 100644
--- a/test/test_open3.rb
+++ b/test/test_open3.rb
@@ -320,5 +320,6 @@ class TestOpen3 < Test::Unit::TestCase
command = [RUBY, '-e', 'puts "test_integer_and_symbol_key"']
out, status = Open3.capture2(*command, :chdir => '.', 2 => IO::NULL)
assert_equal("test_integer_and_symbol_key\n", out)
+ assert_predicate(status, :success?)
end
end