Permalink
Browse files

add first class support for trinidad, fixes #482

  • Loading branch information...
1 parent 700d5b2 commit cab56ed7d64b9ffb6d4df48cb8d7d3153890f3ee @rkh rkh committed May 13, 2012
Showing with 3 additions and 13 deletions.
  1. +0 −1 Gemfile
  2. +0 −1 lib/sinatra/base.rb
  3. +2 −8 test/integration_helper.rb
  4. +1 −3 test/integration_test.rb
View
@@ -47,7 +47,6 @@ if RUBY_ENGINE == 'jruby'
gem 'nokogiri', '!= 1.5.0'
gem 'jruby-openssl'
gem 'trinidad'
- gem 'mizuno'
else
gem 'yajl-ruby'
gem 'nokogiri'
View
@@ -1617,7 +1617,6 @@ class << self
server.unshift 'controll_tower'
else
server.unshift 'mongrel' if ruby_engine.nil?
- server.unshift 'mizuno' if ruby_engine =='jruby'
server.unshift 'puma' if ruby_engine != 'rbx'
server.unshift 'thin' if ruby_engine != 'jruby'
server.unshift 'puma' if ruby_engine == 'rbx'
View
@@ -134,21 +134,15 @@ def trinidad?
name.to_s == "trinidad"
end
- def mizuno?
- name.to_s == "mizuno"
- end
-
def warnings
log.scan(%r[(?:\(eval|lib/sinatra).*warning:.*$])
end
def run_test(target, &block)
retries ||= 3
target.server = self
- Timeout.timeout(60) do
- run unless alive?
- target.instance_eval(&block)
- end
+ run unless alive?
+ target.instance_eval(&block)
rescue Exception => error
retries -= 1
kill
View
@@ -21,7 +21,7 @@ class IntegrationTest < Test::Unit::TestCase
end
it 'streams' do
- next if server.webrick? or server.trinidad? or server.mizuno?
+ next if server.webrick? or server.trinidad?
times, chunks = [Time.now], []
server.get_stream do |chunk|
next if chunk.empty?
@@ -70,8 +70,6 @@ class IntegrationTest < Test::Unit::TestCase
end
it 'starts the correct server' do
- next if RUBY_ENGINE == 'jruby'
-
exp = %r{
==\sSinatra/#{Sinatra::VERSION}\s
has\staken\sthe\sstage\son\s\d+\sfor\sdevelopment\s

0 comments on commit cab56ed

Please sign in to comment.