From 64349662ac18f52849cc215494d77e3719dfa2a7 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 29 Dec 2017 06:25:29 +0000 Subject: webrick: remove concurrent-ruby dev dependency Using the Queue class in stdlib is sufficient for this test, so there's no need for a new development dependency. And one big reason I like webrick is it's bundled with Ruby and has no 3rd-party C ext dependencies; so having to download and install one is a bummer. --- rack.gemspec | 1 - test/spec_webrick.rb | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/rack.gemspec b/rack.gemspec index ec2b79f6..d8374287 100644 --- a/rack.gemspec +++ b/rack.gemspec @@ -30,6 +30,5 @@ EOF s.add_development_dependency 'minitest', "~> 5.0" s.add_development_dependency 'minitest-sprint' - s.add_development_dependency 'concurrent-ruby' s.add_development_dependency 'rake' end diff --git a/test/spec_webrick.rb b/test/spec_webrick.rb index e3050f6f..855fa9eb 100644 --- a/test/spec_webrick.rb +++ b/test/spec_webrick.rb @@ -1,6 +1,6 @@ require 'minitest/autorun' require 'rack/mock' -require 'concurrent/atomic/event' +require 'thread' require File.expand_path('../testrequest', __FILE__) Thread.abort_on_exception = true @@ -119,7 +119,7 @@ describe Rack::Handler::WEBrick do end it "provide a .run" do - latch = Concurrent::Event.new + queue = Queue.new t = Thread.new do Rack::Handler::WEBrick.run(lambda {}, @@ -129,13 +129,12 @@ describe Rack::Handler::WEBrick do :Logger => WEBrick::Log.new(nil, WEBrick::BasicLog::WARN), :AccessLog => []}) { |server| assert_kind_of WEBrick::HTTPServer, server - @s = server - latch.set + queue.push(server) } end - latch.wait - @s.shutdown + server = queue.pop + server.shutdown t.join end -- cgit v1.2.3-24-ge0c7