From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS47066 71.19.144.0/20 X-Spam-Status: No, score=-1.9 required=3.0 tests=AWL,BAYES_00 shortcircuit=no autolearn=unavailable version=3.3.2 X-Original-To: normalperson@yhbt.net Received: from zedshaw2.xen.prgmr.com (zedshaw2.xen.prgmr.com [71.19.156.177]) by dcvr.yhbt.net (Postfix) with ESMTP id 823A21F6CA for ; Tue, 30 Apr 2013 02:40:11 +0000 (UTC) Received: from zedshaw2.xen.prgmr.com (unknown [IPv6:::1]) by zedshaw2.xen.prgmr.com (Postfix) with ESMTP id F2F9873DEE for ; Tue, 30 Apr 2013 02:42:08 +0000 (UTC) MIME-Version: 1.0 Date: Tue, 30 Apr 2013 02:39:26 +0000 From: Eric Wong List-Archive: List-Help: List-Id: List-Post: List-Subscribe: List-Unsubscribe: Message-Id: <1367289582-31293-2-git-send-email-normalperson@yhbt.net> Precedence: list References: <1367289582-31293-1-git-send-email-normalperson@yhbt.net> Sender: sleepy.penguin@librelist.org Subject: [sleepy.penguin] [PATCH 01/17] test_epoll: remove assert_nothing_raised To: sleepy.penguin@librelist.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit assert_nothing_raised hides backtraces on real errors, so we'll stop doing it, now. --- test/test_epoll.rb | 60 ++++++++++++++++++++++-------------------------------- 1 file changed, 24 insertions(+), 36 deletions(-) diff --git a/test/test_epoll.rb b/test/test_epoll.rb index 7c648ff..b2c5c48 100644 --- a/test/test_epoll.rb +++ b/test/test_epoll.rb @@ -122,11 +122,9 @@ def test_edge_accept end def teardown - assert_nothing_raised do - @rd.close unless @rd.closed? - @wr.close unless @wr.closed? - @ep.close unless @ep.closed? - end + @rd.close unless @rd.closed? + @wr.close unless @wr.closed? + @ep.close unless @ep.closed? end def test_max_events_big @@ -170,11 +168,9 @@ def test_signal_safe_wait_forever exit!(0) end time[:START_WAIT] = Time.now - assert_nothing_raised do - @ep.wait do |flags, obj| - tmp << [ flags, obj ] - time[:EP] = Time.now - end + @ep.wait do |flags, obj| + tmp << [ flags, obj ] + time[:EP] = Time.now end assert_equal([[Epoll::IN, @rd]], tmp) _, status = Process.waitpid2(pid) @@ -222,12 +218,10 @@ def test_hup def test_multiple r, w = IO.pipe - assert_nothing_raised do - @ep.add r, Epoll::IN - @ep.add @rd, Epoll::IN - @ep.add w, Epoll::OUT - @ep.add @wr, Epoll::OUT - end + @ep.add r, Epoll::IN + @ep.add @rd, Epoll::IN + @ep.add w, Epoll::OUT + @ep.add @wr, Epoll::OUT tmp = [] @ep.wait { |flags, obj| tmp << [ flags, obj ] } assert_equal 2, tmp.size @@ -238,16 +232,14 @@ def test_multiple end def test_gc - assert_nothing_raised { 4096.times { Epoll.new } } + 4096.times { Epoll.new } assert ! @ep.closed? end unless RBX def test_gc_to_io - assert_nothing_raised do - 4096.times do - ep = Epoll.new - assert_kind_of IO, ep.to_io - end + 4096.times do + ep = Epoll.new + assert_kind_of IO, ep.to_io end assert ! @ep.closed? end unless RBX @@ -259,7 +251,7 @@ def test_clone clone.add @wr, Epoll::OUT @ep.wait(nil, 0) { |flags, obj| tmp << [ flags, obj ] } assert_equal([[Epoll::OUT, @wr]], tmp) - assert_nothing_raised { clone.close } + clone.close end def test_dup @@ -269,16 +261,14 @@ def test_dup clone.add @wr, Epoll::OUT @ep.wait(nil, 0) { |flags, obj| tmp << [ flags, obj ] } assert_equal([[Epoll::OUT, @wr]], tmp) - assert_nothing_raised { clone.close } + clone.close end def test_set_idempotency - assert_nothing_raised do - @ep.set @rd, Epoll::IN - @ep.set @rd, Epoll::IN - @ep.set @wr, Epoll::OUT - @ep.set @wr, Epoll::OUT - end + @ep.set @rd, Epoll::IN + @ep.set @rd, Epoll::IN + @ep.set @wr, Epoll::OUT + @ep.set @wr, Epoll::OUT end def test_wait_timeout @@ -290,10 +280,8 @@ def test_wait_timeout def test_del assert_raises(Errno::ENOENT) { @ep.del(@rd) } - assert_nothing_raised do - @ep.add(@rd, Epoll::IN) - @ep.del(@rd) - end + @ep.add(@rd, Epoll::IN) + @ep.del(@rd) end def test_wait_read @@ -368,7 +356,7 @@ def test_new def test_delete assert_nil @ep.delete(@rd) assert_nil @ep.delete(@wr) - assert_nothing_raised { @ep.add @rd, Epoll::IN } + @ep.add @rd, Epoll::IN assert_equal @rd, @ep.delete(@rd) assert_nil @ep.delete(@rd) end @@ -471,7 +459,7 @@ def test_epoll_wait_signal_torture exit!(0) end while tmp.empty? - assert_nothing_raised { @ep.wait(nil, 100) { |flags,obj| tmp << obj } } + @ep.wait(nil, 100) { |flags,obj| tmp << obj } empty += 1 end _, status = Process.waitpid2(pid) -- 1.8.2.1.367.gc875ca7