Skip to content

Commit 7e15e72

Browse files
committed
Tweak test to work more reliably on Java 17+
1 parent 0c4f0c2 commit 7e15e72

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

src/spec/ruby/rack/application_spec.rb

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -704,23 +704,28 @@ def createRackServletWrapper(runtime, rackup, filename); end
704704
end
705705
app
706706
end
707+
num_runtimes = 3
707708
@rack_config.stub(:getBooleanProperty).with("jruby.runtime.init.wait").and_return false
708-
@rack_config.should_receive(:getInitialRuntimes).and_return 3
709-
@rack_config.should_receive(:getMaximumRuntimes).and_return 3
709+
@rack_config.should_receive(:getInitialRuntimes).and_return num_runtimes
710+
@rack_config.should_receive(:getMaximumRuntimes).and_return num_runtimes
710711

711-
@pooling_factory.init(@rack_context)
712+
begin
713+
@pooling_factory.init(@rack_context)
714+
rescue org.jruby.rack.RackInitializationException
715+
# ignore - sometimes initialization happens fast enough that the init error is thrown already
716+
end
712717
sleep(0.20)
713718

714719
failed = 0
715-
3.times do
720+
num_runtimes.times do
716721
begin
717722
@pooling_factory.getApplication
718723
rescue org.jruby.rack.RackInitializationException
719724
failed += 1
720725
end
721726
end
722-
if failed != 3
723-
fail "@pooling_factory.getApplication expected to fail once, but failed #{failed}-time(s)"
727+
if failed != num_runtimes
728+
fail "@pooling_factory.getApplication expected to fail #{num_runtimes} times, but failed #{failed} time(s)"
724729
end
725730
end
726731

0 commit comments

Comments
 (0)