openssl-ruby-tests: remove no longer needed patch.
ok jeremy
This commit is contained in:
parent
4a406e5168
commit
4a16fc7db6
@ -3,7 +3,7 @@ COMMENT = sources of the Ruby OpenSSL gem for regression testing
|
||||
# Follows HEAD
|
||||
VERSION = 20221123
|
||||
DISTNAME = openssl-ruby-tests-${VERSION}
|
||||
REVISION = 2
|
||||
REVISION = 3
|
||||
|
||||
GH_ACCOUNT = ruby
|
||||
GH_PROJECT = openssl
|
||||
|
@ -1,65 +0,0 @@
|
||||
Try to avoid relying on the test-unit gem for now. This reverts
|
||||
https://github.com/ruby/openssl/commit/7e45e3899d1e3aa87826d7d61f6ebad4f1691e6b
|
||||
|
||||
Index: test/openssl/envutil.rb
|
||||
--- test/openssl/envutil.rb.orig
|
||||
+++ test/openssl/envutil.rb
|
||||
@@ -282,6 +282,58 @@ eom
|
||||
end
|
||||
values
|
||||
end
|
||||
+
|
||||
+ def mu_pp(obj) #:nodoc:
|
||||
+ obj.pretty_inspect.chomp
|
||||
+ end
|
||||
+
|
||||
+ # :call-seq:
|
||||
+ # assert_raise_with_message(exception, expected, msg = nil, &block)
|
||||
+ #
|
||||
+ #Tests if the given block raises an exception with the expected
|
||||
+ #message.
|
||||
+ #
|
||||
+ # assert_raise_with_message(RuntimeError, "foo") do
|
||||
+ # nil #Fails, no Exceptions are raised
|
||||
+ # end
|
||||
+ #
|
||||
+ # assert_raise_with_message(RuntimeError, "foo") do
|
||||
+ # raise ArgumentError, "foo" #Fails, different Exception is raised
|
||||
+ # end
|
||||
+ #
|
||||
+ # assert_raise_with_message(RuntimeError, "foo") do
|
||||
+ # raise "bar" #Fails, RuntimeError is raised but the message differs
|
||||
+ # end
|
||||
+ #
|
||||
+ # assert_raise_with_message(RuntimeError, "foo") do
|
||||
+ # raise "foo" #Raises RuntimeError with the message, so assertion succeeds
|
||||
+ # end
|
||||
+ def assert_raise_with_message(exception, expected, msg = nil, &block)
|
||||
+ case expected
|
||||
+ when String
|
||||
+ assert = :assert_equal
|
||||
+ when Regexp
|
||||
+ assert = :assert_match
|
||||
+ else
|
||||
+ raise TypeError, "Expected #{expected.inspect} to be a kind of String or Regexp, not #{expected.class}"
|
||||
+ end
|
||||
+
|
||||
+ ex = m = nil
|
||||
+ ex = assert_raise(exception, msg || "Exception(#{exception}) with message matches to #{expected.inspect}") do
|
||||
+ yield
|
||||
+ end
|
||||
+ m = ex.message
|
||||
+ msg = message(msg, "") {"Expected Exception(#{exception}) was raised, but the message doesn't match"}
|
||||
+
|
||||
+ if assert == :assert_equal
|
||||
+ assert_equal(expected, m, msg)
|
||||
+ else
|
||||
+ msg = message(msg) { "Expected #{mu_pp expected} to match #{mu_pp m}" }
|
||||
+ assert expected =~ m, msg
|
||||
+ block.binding.eval("proc{|_|$~=_}").call($~)
|
||||
+ end
|
||||
+ ex
|
||||
+ end
|
||||
end
|
||||
end
|
||||
end
|
Loading…
x
Reference in New Issue
Block a user