Sync tests with trunk

4 files changed, 4 insertions, 4 deletions

diff --git a/test/test_config.rb b/test/test_config.rb
index 4ceb7465..62f9fabc 100644
--- a/test/test_config.rb
+++ b/test/test_config.rb
@@ -23,7 +23,7 @@ __EOD__
   def test_constants
     assert(defined?(OpenSSL::Config::DEFAULT_CONFIG_FILE))
     config_file = OpenSSL::Config::DEFAULT_CONFIG_FILE
-    pend "DEFAULT_CONFIG_FILE may return a wrong path on your platforms. [Bug #6830]" unless File.readable?(config_file)
+    skip "DEFAULT_CONFIG_FILE may return a wrong path on your platforms. [Bug #6830]" unless File.readable?(config_file)
     assert_nothing_raised do
       OpenSSL::Config.load(config_file)
     end
diff --git a/test/test_pair.rb b/test/test_pair.rb
index 9056911b..3aca5f48 100644
--- a/test/test_pair.rb
+++ b/test/test_pair.rb
@@ -3,7 +3,7 @@ require_relative 'utils'
 if defined?(OpenSSL::TestUtils)
 
 require 'socket'
-require_relative 'ut_eof'
+require_relative '../ruby/ut_eof'
 
 module OpenSSL::SSLPairM
   def server
diff --git a/test/test_ssl.rb b/test/test_ssl.rb
index b65399f9..3eddb0a8 100644
--- a/test/test_ssl.rb
+++ b/test/test_ssl.rb
@@ -27,7 +27,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
   end
 
   def test_not_started_session
-    pend "non socket argument of SSLSocket.new is not supported on this platform" if /mswin|mingw/ =~ RUBY_PLATFORM
+    skip "non socket argument of SSLSocket.new is not supported on this platform" if /mswin|mingw/ =~ RUBY_PLATFORM
     open(__FILE__) do |f|
       assert_nil OpenSSL::SSL::SSLSocket.new(f).cert
     end
diff --git a/test/test_x509req.rb b/test/test_x509req.rb
index 783581b8..27040cb7 100644
--- a/test/test_x509req.rb
+++ b/test/test_x509req.rb
@@ -138,7 +138,7 @@ class OpenSSL::TestX509Request < Test::Unit::TestCase
     req.version = 1
     assert_equal(false, req.verify(@rsa1024))
   rescue OpenSSL::X509::RequestError
-    pend
+    skip
   end
 
   def test_sign_and_verify_dsa_md5