summaryrefslogtreecommitdiff
path: root/test/rinda
diff options
context:
space:
mode:
authorAlan Wu <alanwu@ruby-lang.org>2022-06-26 09:24:22 -0400
committerAlan Wu <alanwu@ruby-lang.org>2022-06-26 09:24:22 -0400
commit49d59215506a30c8a11766627f7af0cdfe0de9d4 (patch)
tree110551247f08fcdcab74a93d16c790856579a361 /test/rinda
parentd3d5ef0cca160fca538c7f556c5a6e08df5847e6 (diff)
Fix Rinda test teardown for omitted tests
New test failures on MINGW appeared after c2e37c8ff7da395f33fae546d9ae9e2408fc9236. 1) Error: Rinda::TupleSpaceProxyTest#test_00_template: NoMethodError: undefined method `stop_service' for nil:NilClass D:/a/ruby/ruby/src/test/rinda/test_rinda.rb:516:in `teardown' 2) Error: Rinda::TupleSpaceProxyTest#test_ruby_talk_264062: NoMethodError: undefined method `stop_service' for nil:NilClass D:/a/ruby/ruby/src/test/rinda/test_rinda.rb:516:in `teardown' Teardown happens even when the test is omitted. See: https://github.com/ruby/ruby/runs/7058984522
Diffstat (limited to 'test/rinda')
-rw-r--r--test/rinda/test_rinda.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb
index 253eb84f0a..85df8e2b9e 100644
--- a/test/rinda/test_rinda.rb
+++ b/test/rinda/test_rinda.rb
@@ -497,6 +497,7 @@ class TupleSpaceProxyTest < Test::Unit::TestCase
def setup
if RUBY_PLATFORM.match?(/mingw/) && ENV['MSYSTEM'] == 'UCRT64'
+ @omitted = true
omit 'This test seems to randomly hang on GitHub Actions MinGW UCRT64'
end
super
@@ -506,6 +507,9 @@ class TupleSpaceProxyTest < Test::Unit::TestCase
@server = DRb.start_service("druby://localhost:0")
end
def teardown
+ return if @omitted
+ @omitted = false
+
# implementation-dependent
@ts_base.instance_eval{
if th = @keeper