From 7a514fc6f190a1c935e1d63bd2cbd6af6764e627 Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 18 Jul 2012 00:36:01 +0000 Subject: [PATCH] * test/win32ole/test_win32ole_event.rb (TestWIN32OLE_EVENT): use standard skip method to skip tests. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 ++++++++-- test/win32ole/test_win32ole_event.rb | 12 ++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index a8a43df5a1..f00454e4f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jul 18 09:33:59 2012 NAKAMURA Usaku + + * test/win32ole/test_win32ole_event.rb (TestWIN32OLE_EVENT): use + standard skip method to skip tests. + Wed Jul 18 09:26:45 2012 Eric Hodel * lib/logger.rb: Updated typos and output to match modern Logger @@ -5,8 +10,9 @@ Wed Jul 18 09:26:45 2012 Eric Hodel Wed Jul 18 07:59:29 2012 Takeyuki FUJIOKA - * lib/cgi/util.rb (CGI.escapeHTML,unescapeHTML): Add ' for HTML5 escaping. - [Feature #6620] + * lib/cgi/util.rb (CGI.escapeHTML,unescapeHTML): Add ' for HTML5 + escaping. + [Feature #6620] Tue Jul 17 22:17:13 2012 Tanaka Akira diff --git a/test/win32ole/test_win32ole_event.rb b/test/win32ole/test_win32ole_event.rb index 7e7ee10222..03e4dcda9e 100644 --- a/test/win32ole/test_win32ole_event.rb +++ b/test/win32ole/test_win32ole_event.rb @@ -22,12 +22,12 @@ def ado_installed? end if defined?(WIN32OLE_EVENT) - dotest = ado_installed? - if !dotest - STDERR.puts("\n#{__FILE__} skipped(ActiveX Data Object Library not found.)") - end - if dotest - class TestWIN32OLE_EVENT < Test::Unit::TestCase + class TestWIN32OLE_EVENT < Test::Unit::TestCase + unless ado_installed? + def test_dummy_for_skip_message + skip "ActiveX Data Object Library not found" + end + else CONNSTR="Driver={Microsoft Text Driver (*.txt; *.csv)};DefaultDir=.;" module ADO end