diff options
| -rw-r--r-- | test/envutil.rb | 7 | ||||
| -rw-r--r-- | test/test_engine.rb | 4 | ||||
| -rw-r--r-- | test/test_pair.rb | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/test/envutil.rb b/test/envutil.rb index ac2a3c0c..a4964c2c 100644 --- a/test/envutil.rb +++ b/test/envutil.rb @@ -365,7 +365,7 @@ module Test file ||= loc.path line ||= loc.lineno end - line -= 5 # lines until src + line -= 6 # lines until src src = <<eom # -*- coding: #{src.encoding}; -*- require 'test/unit';include Test::Unit::Assertions @@ -373,6 +373,7 @@ module Test puts [Marshal.dump($!)].pack('m')#, "assertions=\#{self._assertions}" exit } + def pend(msg = nil) $stdout.syswrite [Marshal.dump(msg.to_s)].pack("m"); exit! 0 end #{src} class Test::Unit::Runner @@stop_auto_run = true @@ -389,7 +390,9 @@ eom rescue => marshal_error ignore_stderr = nil end - if res + if res.is_a?(String) + pend res + elsif res if bt = res.backtrace bt.each do |l| l.sub!(/\A-:(\d+)/){"#{file}:#{line + $1.to_i}"} diff --git a/test/test_engine.rb b/test/test_engine.rb index bbf56a18..1aa105f1 100644 --- a/test/test_engine.rb +++ b/test/test_engine.rb @@ -14,7 +14,7 @@ class OpenSSL::TestEngine < OpenSSL::TestCase def test_openssl_engine_builtin with_openssl <<-'end;' orig = OpenSSL::Engine.engines - skip "'openssl' is already loaded" if orig.any? { |e| e.id == "openssl" } + pend "'openssl' is already loaded" if orig.any? { |e| e.id == "openssl" } engine = OpenSSL::Engine.load("openssl") assert_equal(true, engine) assert_equal(1, OpenSSL::Engine.engines.size - orig.size) @@ -24,7 +24,7 @@ class OpenSSL::TestEngine < OpenSSL::TestCase def test_openssl_engine_by_id_string with_openssl <<-'end;' orig = OpenSSL::Engine.engines - skip "'openssl' is already loaded" if orig.any? { |e| e.id == "openssl" } + pend "'openssl' is already loaded" if orig.any? { |e| e.id == "openssl" } engine = get_engine assert_not_nil(engine) assert_equal(1, OpenSSL::Engine.engines.size - orig.size) diff --git a/test/test_pair.rb b/test/test_pair.rb index 3895a944..575cb6c1 100644 --- a/test/test_pair.rb +++ b/test/test_pair.rb @@ -436,7 +436,7 @@ module OpenSSL::TestPairM begin ctx1.ciphers = "ECDH" rescue OpenSSL::SSL::SSLError - skip "ECDH is not enabled in this OpenSSL" if $!.message =~ /no cipher match/ + pend "ECDH is not enabled in this OpenSSL" if $!.message =~ /no cipher match/ raise end ctx1.ecdh_curves = "P-384:P-521" |