aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-21 16:44:56 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-21 16:44:56 +0000
commitb39132e993f7744553943453d912d1efd8ce4ffa (patch)
tree19729cc952233ee303f2c54a9c07001bf820d524 /test
parentfacccd3129691825b79e4405ddf12d2eff2f9e96 (diff)
downloadruby-b39132e993f7744553943453d912d1efd8ce4ffa.tar.gz
Revert "ignore server side error"
This reverts commit r60314. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60315 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/net/http/test_https.rb2
-rw-r--r--test/ruby/test_dir.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/net/http/test_https.rb b/test/net/http/test_https.rb
index 5aaea40139..5a17cc8186 100644
--- a/test/net/http/test_https.rb
+++ b/test/net/http/test_https.rb
@@ -212,7 +212,7 @@ class TestNetHTTPS < Test::Unit::TestCase
http.verify_callback = Proc.new do |preverify_ok, store_ctx|
true
end
- @log_tester = lambda {|_| }
+ @log_tester = lambda {|log| assert_not_equal([], log) }
ex = assert_raise(OpenSSL::SSL::SSLError){
http.request_get("/") {|res| }
}
diff --git a/test/ruby/test_dir.rb b/test/ruby/test_dir.rb
index f12fd13c58..cead4beb93 100644
--- a/test/ruby/test_dir.rb
+++ b/test/ruby/test_dir.rb
@@ -155,7 +155,7 @@ class TestDir < Test::Unit::TestCase
open(File.join(@root, "}}{}"), "wb") {}
open(File.join(@root, "}}a"), "wb") {}
assert_equal(%w(}}{} }}a).map {|f| File.join(@root, f)}, Dir.glob(File.join(@root, '}}{\{\},a}')))
- assert_equal(%w(}}{} }}a b c).map {|f| File.join(@root, f)}.sort, Dir.glob(File.join(@root, '{\}\}{\{\},a},b,c}')).sort)
+ assert_equal(%w(}}{} }}a b c).map {|f| File.join(@root, f)}, Dir.glob(File.join(@root, '{\}\}{\{\},a},b,c}')))
end
def test_glob_recursive