diff options
author | Benoit Daloze <eregontp@gmail.com> | 2019-07-27 12:40:09 +0200 |
---|---|---|
committer | Benoit Daloze <eregontp@gmail.com> | 2019-07-27 12:40:09 +0200 |
commit | 5c276e1cc91c5ab2a41fbf7827af2fed914a2bc0 (patch) | |
tree | 05b5c68c8b2a00224d4646ea3b26ce3877efaadd /spec/ruby/core/threadgroup | |
parent | a06301b103371b0b7da8eaca26ba744961769f99 (diff) |
Update to ruby/spec@875a09e
Diffstat (limited to 'spec/ruby/core/threadgroup')
-rw-r--r-- | spec/ruby/core/threadgroup/add_spec.rb | 9 | ||||
-rw-r--r-- | spec/ruby/core/threadgroup/enclose_spec.rb | 11 | ||||
-rw-r--r-- | spec/ruby/core/threadgroup/fixtures/classes.rb | 6 | ||||
-rw-r--r-- | spec/ruby/core/threadgroup/list_spec.rb | 11 |
4 files changed, 14 insertions, 23 deletions
diff --git a/spec/ruby/core/threadgroup/add_spec.rb b/spec/ruby/core/threadgroup/add_spec.rb index 5d1354e65f..2921c1ab22 100644 --- a/spec/ruby/core/threadgroup/add_spec.rb +++ b/spec/ruby/core/threadgroup/add_spec.rb @@ -1,15 +1,14 @@ require_relative '../../spec_helper' -require_relative 'fixtures/classes' describe "ThreadGroup#add" do before :each do - @chan1,@chan2 = Channel.new,Channel.new - @thread = Thread.new { @chan1 << :go; @chan2.receive } - @chan1.receive + @q1, @q2 = Queue.new, Queue.new + @thread = Thread.new { @q1 << :go; @q2.pop } + @q1.pop end after :each do - @chan2 << :done + @q2 << :done @thread.join end diff --git a/spec/ruby/core/threadgroup/enclose_spec.rb b/spec/ruby/core/threadgroup/enclose_spec.rb index d4a4359c66..dd9a7a362d 100644 --- a/spec/ruby/core/threadgroup/enclose_spec.rb +++ b/spec/ruby/core/threadgroup/enclose_spec.rb @@ -1,15 +1,14 @@ require_relative '../../spec_helper' -require_relative 'fixtures/classes' describe "ThreadGroup#enclose" do before :each do - @chan1,@chan2 = Channel.new,Channel.new - @thread = Thread.new { @chan1 << :go; @chan2.receive } - @chan1.receive + @q1, @q2 = Queue.new, Queue.new + @thread = Thread.new { @q1 << :go; @q2.pop } + @q1.pop end after :each do - @chan2 << :done + @q2 << :done @thread.join end @@ -18,7 +17,7 @@ describe "ThreadGroup#enclose" do default_group = @thread.group thread_group.add(@thread) thread_group.enclose - lambda do + -> do default_group.add(@thread) end.should raise_error(ThreadError) end diff --git a/spec/ruby/core/threadgroup/fixtures/classes.rb b/spec/ruby/core/threadgroup/fixtures/classes.rb deleted file mode 100644 index 7dfe5e92d1..0000000000 --- a/spec/ruby/core/threadgroup/fixtures/classes.rb +++ /dev/null @@ -1,6 +0,0 @@ -unless defined? Channel - require 'thread' - class Channel < Queue - alias receive shift - end -end diff --git a/spec/ruby/core/threadgroup/list_spec.rb b/spec/ruby/core/threadgroup/list_spec.rb index 5f2281af8d..b2ac64324a 100644 --- a/spec/ruby/core/threadgroup/list_spec.rb +++ b/spec/ruby/core/threadgroup/list_spec.rb @@ -1,17 +1,16 @@ require_relative '../../spec_helper' -require_relative 'fixtures/classes' describe "ThreadGroup#list" do it "returns the list of threads in the group" do - chan = Channel.new - th1 = Thread.new { chan << :go; sleep } - chan.receive.should == :go + q = Queue.new + th1 = Thread.new { q << :go; sleep } + q.pop.should == :go tg = ThreadGroup.new tg.add(th1) tg.list.should include(th1) - th2 = Thread.new { chan << :go; sleep } - chan.receive.should == :go + th2 = Thread.new { q << :go; sleep } + q.pop.should == :go tg.add(th2) (tg.list & [th1, th2]).should include(th1, th2) |