diff options
| author | Jean byroot Boussier <jean.boussier+github@shopify.com> | 2023-02-06 23:30:42 +0100 |
|---|---|---|
| committer | Jean Boussier <jean.boussier@gmail.com> | 2023-02-08 09:50:00 +0100 |
| commit | 8ce2fb9bbbaea14737c84385b1573f743a30f773 (patch) | |
| tree | b1909a3f62f01b61b19369028c698bc7fbc8692e /test/ruby/test_require.rb | |
| parent | 3ab34551450c7a3a3e1ae0b24bf6b78d26129dfa (diff) | |
Only emit circular dependency warning for owned thread shields
[Bug #19415]
If multiple threads attemps to load the same file concurrently
it's not a circular dependency issue.
So we check that the existing ThreadShield is owner by the current
fiber before warning about circular dependencies.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/7257
Diffstat (limited to 'test/ruby/test_require.rb')
| -rw-r--r-- | test/ruby/test_require.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb index 604ddf09d8..e0cfc8c914 100644 --- a/test/ruby/test_require.rb +++ b/test/ruby/test_require.rb @@ -562,9 +562,6 @@ class TestRequire < Test::Unit::TestCase assert_equal(true, (t1_res ^ t2_res), bug5754 + " t1:#{t1_res} t2:#{t2_res}") assert_equal([:pre, :post], scratch, bug5754) - - assert_match(/circular require/, output) - assert_match(/in #{__method__}'$/o, output) } ensure $VERBOSE = verbose |