diff options
| author | James E. King III <jking@apache.org> | 2018-06-09 23:02:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-09 23:02:12 -0400 |
| commit | b92ca5f22618fcdcad9a4c24cd1a8fe64418deda (patch) | |
| tree | 3c83daf54b43ec67ae10b36c2d85822ec2250c6d /lib/rb | |
| parent | b03d74992e453f24801e12dbb030ae384ec7e68a (diff) | |
| download | thrift-b92ca5f22618fcdcad9a4c24cd1a8fe64418deda.tar.gz | |
THRIFT-4582: Fix Xenial CI build issues (#1563)
* THRIFT-4582: fix xenial build issues
* THRIFT-2913: fix Thrift::ThreadPoolServer should serve inside a thread on xenial
* THRIFT-4478: Move Xenial up to dmd 2.075.1 as that is the new minimum
version that works since the changes for 2.080.0 went in.
Diffstat (limited to 'lib/rb')
| -rw-r--r-- | lib/rb/spec/server_spec.rb | 1 | ||||
| -rw-r--r-- | lib/rb/thrift.gemspec | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/rb/spec/server_spec.rb b/lib/rb/spec/server_spec.rb index ee58c7cb4..57f523776 100644 --- a/lib/rb/spec/server_spec.rb +++ b/lib/rb/spec/server_spec.rb @@ -144,6 +144,7 @@ describe 'Server' do exception_q.push(StandardError.new('ERROR')) end expect { @server.rescuable_serve }.to(raise_error('ERROR')) + sleep(0.15) end it "should avoid running the server twice when retrying rescuable_serve" do diff --git a/lib/rb/thrift.gemspec b/lib/rb/thrift.gemspec index fcc344f48..0f96c3fcc 100644 --- a/lib/rb/thrift.gemspec +++ b/lib/rb/thrift.gemspec @@ -34,7 +34,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'rack', '~> 2.0' s.add_development_dependency 'rack-test', '~> 0.8.3' s.add_development_dependency 'rake', '~> 12.3' - s.add_development_dependency 'rspec', '~> 3.5' + s.add_development_dependency 'rspec', '~> 3.7' s.add_development_dependency 'thin', '~> 1.7' end |