From mboxrd@z Thu Jan 1 00:00:00 1970 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, MSGID_FROM_MTA_HEADER shortcircuit=no autolearn=unavailable version=3.3.2 Path: news.gmane.org!not-for-mail From: Eric Wong Newsgroups: gmane.comp.lang.ruby.raindrops.general Subject: [PATCH] test_watcher: fix for Ruby trunk r40195 and later Date: Mon, 2 Sep 2013 10:29:17 +0000 Message-ID: <20130902102917.GA4800@dcvr.yhbt.net> References: <20130902102917.GA4800@dcvr.yhbt.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1378117773 20824 80.91.229.3 (2 Sep 2013 10:29:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 2 Sep 2013 10:29:33 +0000 (UTC) To: raindrops@librelist.org Original-X-From: raindrops@librelist.org Mon Sep 02 12:29:36 2013 Return-path: Envelope-to: gclrrg-raindrops@m.gmane.org In-Reply-To: <20130902102917.GA4800@dcvr.yhbt.net> List-Archive: List-Help: List-Id: List-Post: List-Subscribe: List-Unsubscribe: Precedence: list Original-Sender: raindrops@librelist.org Xref: news.gmane.org gmane.comp.lang.ruby.raindrops.general:120 Archived-At: Received: from zedshaw2.xen.prgmr.com ([71.19.156.177]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VGRO3-000378-QG for gclrrg-raindrops@m.gmane.org; Mon, 02 Sep 2013 12:29:36 +0200 Received: from zedshaw2.xen.prgmr.com (unknown [IPv6:::1]) by zedshaw2.xen.prgmr.com (Postfix) with ESMTP id 16D9575076 for ; Mon, 2 Sep 2013 10:38:25 +0000 (UTC) assert_raises doesn't capture exceptions the same way rescue works. --- test/test_watcher.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/test_watcher.rb b/test/test_watcher.rb index 5e45dcd..70e8e75 100644 --- a/test/test_watcher.rb +++ b/test/test_watcher.rb @@ -154,7 +154,12 @@ class TestWatcher < Test::Unit::TestCase assert_equal before, headers["X-Last-Peak-At"], headers.inspect @ios << @srv.accept - assert_raises(Errno::EAGAIN) { @srv.accept_nonblock } + begin + @srv.accept_nonblock + assert false, "we should not get here" + rescue => e + assert_kind_of Errno::EAGAIN, e + end sleep 0.1 env = @req.class.env_for "/queued/#@addr.txt" status, headers, body = @app.call(env.dup) -- Eric Wong