[前][次][番号順一覧][スレッド一覧]

ruby-changes:31208

From: nobu <ko1@a...>
Date: Tue, 15 Oct 2013 04:14:53 +0900 (JST)
Subject: [ruby-changes:31208] nobu:r43287 (trunk): test/-ext-: suppress warnings

nobu	2013-10-15 04:14:27 +0900 (Tue, 15 Oct 2013)

  New Revision: 43287

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=43287

  Log:
    test/-ext-: suppress warnings

  Modified files:
    trunk/test/-ext-/debug/test_debug.rb
    trunk/test/-ext-/old_thread_select/test_old_thread_select.rb
    trunk/test/-ext-/postponed_job/test_postponed_job.rb
    trunk/test/-ext-/string/test_ellipsize.rb
    trunk/test/-ext-/tracepoint/test_tracepoint.rb
Index: test/-ext-/debug/test_debug.rb
===================================================================
--- test/-ext-/debug/test_debug.rb	(revision 43286)
+++ test/-ext-/debug/test_debug.rb	(revision 43287)
@@ -3,42 +3,42 @@ require '-test-/debug' https://github.com/ruby/ruby/blob/trunk/test/-ext-/debug/test_debug.rb#L3
 
 class TestDebug < Test::Unit::TestCase
 
-  def binds_check binds
+  def binds_check(binds, msg = nil)
     count = Hash.new(0)
-    assert_instance_of(Array, binds)
+    assert_instance_of(Array, binds, msg)
     binds.each{|(_self, bind, klass, iseq, loc)|
       if _self == self
         count[:self] += 1
       end
 
       if bind
-        assert_instance_of(Binding, bind)
+        assert_instance_of(Binding, bind, msg)
         count[:bind] += 1
       end
 
       if klass
-        assert(klass.instance_of?(Module) || klass.instance_of?(Class))
+        assert(klass.instance_of?(Module) || klass.instance_of?(Class), msg)
         count[:class] += 1
       end
 
       if iseq
         count[:iseq] += 1
-        assert_instance_of(RubyVM::InstructionSequence, iseq)
+        assert_instance_of(RubyVM::InstructionSequence, iseq, msg)
 
         # check same location
-        assert_equal(loc.path, iseq.path)
-        assert_equal(loc.absolute_path, iseq.absolute_path)
-        assert_equal(loc.label, iseq.label)
-        assert_operator(loc.lineno, :>=, iseq.first_lineno)
+        assert_equal(loc.path, iseq.path, msg)
+        assert_equal(loc.absolute_path, iseq.absolute_path, msg)
+        assert_equal(loc.label, iseq.label, msg)
+        assert_operator(loc.lineno, :>=, iseq.first_lineno, msg)
       end
 
-      assert_instance_of(Thread::Backtrace::Location, loc)
+      assert_instance_of(Thread::Backtrace::Location, loc, msg)
 
     }
-    assert_operator(0, :<, count[:self])
-    assert_operator(0, :<, count[:bind])
-    assert_operator(0, :<, count[:iseq])
-    assert_operator(0, :<, count[:class])
+    assert_operator(0, :<, count[:self], msg)
+    assert_operator(0, :<, count[:bind], msg)
+    assert_operator(0, :<, count[:iseq], msg)
+    assert_operator(0, :<, count[:class], msg)
   end
 
   def test_inspector_open
@@ -53,6 +53,6 @@ class TestDebug < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/-ext-/debug/test_debug.rb#L53
   def test_inspector_open_in_eval
     bug7635 = '[ruby-core:51640]'
     binds = inspector_in_eval
-    binds_check binds
+    binds_check binds, bug7635
   end
 end
Index: test/-ext-/old_thread_select/test_old_thread_select.rb
===================================================================
--- test/-ext-/old_thread_select/test_old_thread_select.rb	(revision 43286)
+++ test/-ext-/old_thread_select/test_old_thread_select.rb	(revision 43287)
@@ -46,8 +46,10 @@ class TestOldThreadSelect < Test::Unit:: https://github.com/ruby/ruby/blob/trunk/test/-ext-/old_thread_select/test_old_thread_select.rb#L46
         w.syswrite '.'
         rfds = [ r.fileno, r2.fileno ]
         rc = IO.old_thread_select(rfds, nil, nil, nil)
+        diff = Time.now - t0
         assert_equal [ r.fileno ], rfds, bug5306
         assert_equal 1, rc, bug5306
+        assert_operator diff, :>=, 0, "returned too early: diff=#{diff}"
       end
     end
   end
Index: test/-ext-/postponed_job/test_postponed_job.rb
===================================================================
--- test/-ext-/postponed_job/test_postponed_job.rb	(revision 43286)
+++ test/-ext-/postponed_job/test_postponed_job.rb	(revision 43287)
@@ -19,8 +19,8 @@ class TestPostponed_job < Test::Unit::Te https://github.com/ruby/ruby/blob/trunk/test/-ext-/postponed_job/test_postponed_job.rb#L19
     Bug.postponed_job_call_direct_wrapper(direct)
     Bug.postponed_job_register_wrapper(registered)
 
-    assert_match     /postponed_job_call_direct_wrapper/, direct.join
-    assert_not_match /postponed_job_register_wrapper/, registered.join
+    assert_match(     /postponed_job_call_direct_wrapper/, direct.join)
+    assert_not_match( /postponed_job_register_wrapper/, registered.join)
 
     Bug.postponed_job_register_one(ary = [])
     assert_equal [1], ary
Index: test/-ext-/string/test_ellipsize.rb
===================================================================
--- test/-ext-/string/test_ellipsize.rb	(revision 43286)
+++ test/-ext-/string/test_ellipsize.rb	(revision 43287)
@@ -32,7 +32,7 @@ class Test_StringEllipsize < Test::Unit: https://github.com/ruby/ruby/blob/trunk/test/-ext-/string/test_ellipsize.rb#L32
 
   def test_nonascii
     a = "\u3042"
-    encs = Encoding.list.each do |enc|
+    Encoding.list.each do |enc|
       next if enc.dummy?
       begin
         s = a.encode(enc)
Index: test/-ext-/tracepoint/test_tracepoint.rb
===================================================================
--- test/-ext-/tracepoint/test_tracepoint.rb	(revision 43286)
+++ test/-ext-/tracepoint/test_tracepoint.rb	(revision 43287)
@@ -12,7 +12,7 @@ class TestTracepointObj < Test::Unit::Te https://github.com/ruby/ruby/blob/trunk/test/-ext-/tracepoint/test_tracepoint.rb#L12
     result = Bug.tracepoint_track_objspace_events{
       99
       'abc'
-      v="foobar"
+      _="foobar"
       Object.new
       nil
     }
@@ -22,6 +22,8 @@ class TestTracepointObj < Test::Unit::Te https://github.com/ruby/ruby/blob/trunk/test/-ext-/tracepoint/test_tracepoint.rb#L22
     assert_equal 2, newobjs.size
     assert_equal 'foobar', newobjs[0]
     assert_equal Object, newobjs[1].class
+    assert_operator free_count, :>=, 0
+    assert_operator gc_start_count, :>=, gc_end_count
   end
 
   def test_tracks_objspace_count
@@ -37,7 +39,7 @@ class TestTracepointObj < Test::Unit::Te https://github.com/ruby/ruby/blob/trunk/test/-ext-/tracepoint/test_tracepoint.rb#L39
     GC.stat(stat2)
     GC.enable
 
-    newobj_count, free_count, gc_start_count, gc_end_count, *newobjs = *result
+    newobj_count, free_count, gc_start_count, gc_end_count, *_newobjs = *result
 
     assert_operator stat2[:total_allocated_object] - stat1[:total_allocated_object], :>=, newobj_count
     assert_operator 1_000_000, :<=, newobj_count

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]