diff options
| author | Jean byroot Boussier <jean.boussier+github@shopify.com> | 2023-02-06 23:30:00 +0100 |
|---|---|---|
| committer | Jean Boussier <jean.boussier@gmail.com> | 2023-02-06 23:30:35 +0100 |
| commit | c19defd02665492de7147572714ebe692260c849 (patch) | |
| tree | abc68e28c4bc4c09e289ca85e09db8124b4ac8b7 /spec/ruby | |
| parent | c30602e64ce437be86180590eee27b0b6ed83a16 (diff) | |
Revert "Only emit circular dependency warning for owned thread shields"
This reverts commit fa49651e05a06512e18ccb2f54a7198c9ff579de.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/7256
Diffstat (limited to 'spec/ruby')
| -rw-r--r-- | spec/ruby/core/kernel/shared/require.rb | 10 | ||||
| -rw-r--r-- | spec/ruby/fixtures/code/concurrent_require_fixture.rb | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/spec/ruby/core/kernel/shared/require.rb b/spec/ruby/core/kernel/shared/require.rb index c629b44389..666ca15e11 100644 --- a/spec/ruby/core/kernel/shared/require.rb +++ b/spec/ruby/core/kernel/shared/require.rb @@ -237,16 +237,6 @@ describe :kernel_require, shared: true do }.should complain(/circular require considered harmful/, verbose: true) ScratchPad.recorded.should == [:loaded] end - - ruby_bug "#17340", ''...'3.3' do - it "loads a file concurrently" do - path = File.expand_path "concurrent_require_fixture.rb", CODE_LOADING_DIR - ScratchPad.record(@object) - -> { - @object.require(path) - }.should_not complain(/circular require considered harmful/, verbose: true) - end - end end describe "(non-extensioned path)" do diff --git a/spec/ruby/fixtures/code/concurrent_require_fixture.rb b/spec/ruby/fixtures/code/concurrent_require_fixture.rb deleted file mode 100644 index fbb036214b..0000000000 --- a/spec/ruby/fixtures/code/concurrent_require_fixture.rb +++ /dev/null @@ -1 +0,0 @@ -Thread.new { ScratchPad.recorded.require(__FILE__) }.join(0.1) |
