Repository: qpid-proton Updated Branches: refs/heads/master ccfd19ce2 -> 5bc84443c
NO-JIRA: [ruby] test fixes: missing SSL, spurious exception messages in ruby 2.5 Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/13e605c3 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/13e605c3 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/13e605c3 Branch: refs/heads/master Commit: 13e605c375a67d81ee2400bece6b985e35112979 Parents: ccfd19c Author: Alan Conway <acon...@redhat.com> Authored: Fri Jun 8 11:00:50 2018 -0400 Committer: Alan Conway <acon...@redhat.com> Committed: Tue Jun 12 20:39:48 2018 -0400 ---------------------------------------------------------------------- ruby/examples/example_test.rb | 1 + ruby/tests/test_container.rb | 4 ++++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/13e605c3/ruby/examples/example_test.rb ---------------------------------------------------------------------- diff --git a/ruby/examples/example_test.rb b/ruby/examples/example_test.rb index c050da2..576acf2 100755 --- a/ruby/examples/example_test.rb +++ b/ruby/examples/example_test.rb @@ -75,6 +75,7 @@ EOS end def test_ssl_send_recv + skip 'SSL not available' unless Qpid::Proton::SSL.present? out = run_script("ssl_send.rb", $url, "examples").read.strip assert_match(/Connection secured with "...*\"\nAll 10 messages confirmed!/, out) want = (0..9).reduce("") { |x,y| x << "Received: sequence #{y}\n" } http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/13e605c3/ruby/tests/test_container.rb ---------------------------------------------------------------------- diff --git a/ruby/tests/test_container.rb b/ruby/tests/test_container.rb index 46ad495..9cf3aec 100644 --- a/ruby/tests/test_container.rb +++ b/ruby/tests/test_container.rb @@ -20,6 +20,10 @@ require 'test_tools' require 'minitest/unit' require 'socket' +# Since ruby 2.5 the default is true, turn it off since we have tests that deliberately +# leak exceptions from threads to very they are caught properly from Container#run() +Thread.report_on_exception = false rescue nil + # MessagingHandler that raises in on_error to catch unexpected errors class ExceptionMessagingHandler def on_error(e) raise e; end --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
