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

ruby-changes:20592

From: suke <ko1@a...>
Date: Sat, 23 Jul 2011 19:14:02 +0900 (JST)
Subject: [ruby-changes:20592] suke:r32640 (trunk): * test/win32ole/test_err_in_callback.rb (test_err_in_callback):

suke	2011-07-23 19:13:53 +0900 (Sat, 23 Jul 2011)

  New Revision: 32640

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

  Log:
    * test/win32ole/test_err_in_callback.rb (test_err_in_callback): 
      skip test if ADODB.connection is not available.

  Modified files:
    trunk/ChangeLog
    trunk/test/win32ole/test_err_in_callback.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32639)
+++ ChangeLog	(revision 32640)
@@ -1,3 +1,8 @@
+Sat Jul 23 19:12:53 2011  Masaki Suketa <masaki.suketa@n...>
+
+	* test/win32ole/test_err_in_callback.rb (test_err_in_callback): 
+	  skip test if ADODB.connection is not available.
+
 Sat Jul 23 15:37:04 2011  NARUSE, Yui  <naruse@r...>
 
 	* parse.y (rb_enc_symname_type): :$a!, @a! and so on are not
Index: test/win32ole/test_err_in_callback.rb
===================================================================
--- test/win32ole/test_err_in_callback.rb	(revision 32639)
+++ test/win32ole/test_err_in_callback.rb	(revision 32640)
@@ -23,7 +23,17 @@
       end
     end
 
+    def available_adodb?
+      begin
+        db = WIN32OLE.new('ADODB.Connection')
+      rescue WIN32OLERuntimeError
+        return false
+      end
+      return true
+    end
+
     def test_err_in_callback
+      skip "'ADODB.Connection' is not available" unless available_adodb?
       if @ruby
         cmd = "#{@ruby} -v #{@iopt} #{@script} > test_err_in_callback.log 2>&1"
         system(cmd)

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

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