Skip to content

Commit

Permalink
Use the bundler shipped with ruby for non-MRI (puma#2811)
Browse files Browse the repository at this point in the history
* Should workaround oracle/truffleruby#2586

* Make the test_lowlevel_error_message test more reliable
  • Loading branch information
eregon authored and MSP-Greg committed Apr 3, 2022
1 parent adc94f4 commit 39c9144
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/non_mri.yml
Expand Up @@ -45,6 +45,9 @@ jobs:
apt-get: ragel
brew: ragel
mingw: _upgrade_ openssl ragel
# Use the bundler shipped with that ruby,
# temporary workaround for https://github.com/oracle/truffleruby/issues/2586
bundler: none
bundler-cache: true
timeout-minutes: 10

Expand Down
5 changes: 5 additions & 0 deletions test/test_puma_server.rb
Expand Up @@ -349,6 +349,11 @@ def test_lowlevel_error_message
@server = Puma::Server.new @app, @events, {:force_shutdown_after => 2}

server_run do
if TestSkips::TRUFFLE
# SystemStackError is too brittle, use something more reliable
raise Exception, "error"
end

require 'json'

# will raise fatal: machine stack overflow in critical region
Expand Down

0 comments on commit 39c9144

Please sign in to comment.