Test: house-keeping - remove JRubyServer
This commit is contained in:
parent
b7bb22cd50
commit
254106265e
|
@ -109,59 +109,7 @@ module IntegrationHelper
|
|||
end
|
||||
end
|
||||
|
||||
if RUBY_ENGINE == "jruby"
|
||||
class JRubyServer < BaseServer
|
||||
def start_vm
|
||||
require 'java'
|
||||
# Create a new container, set load paths and env
|
||||
# SINGLETHREAD means create a new runtime
|
||||
vm = org.jruby.embed.ScriptingContainer.new(org.jruby.embed.LocalContextScope::SINGLETHREAD)
|
||||
vm.load_paths = [File.expand_path('../../lib', __FILE__)]
|
||||
vm.environment = ENV.merge('APP_ENV' => environment.to_s)
|
||||
|
||||
# This ensures processing of RUBYOPT which activates Bundler
|
||||
vm.provider.ruby_instance_config.process_arguments []
|
||||
vm.argv = ['-s', server.to_s, '-o', '127.0.0.1', '-p', port.to_s, '-e', environment.to_s]
|
||||
|
||||
# Set stdout/stderr so we can retrieve log
|
||||
@pipe = java.io.ByteArrayOutputStream.new
|
||||
vm.output = java.io.PrintStream.new(@pipe)
|
||||
vm.error = java.io.PrintStream.new(@pipe)
|
||||
|
||||
Thread.new do
|
||||
# Hack to ensure that Kernel#caller has the same info as
|
||||
# when run from command-line, for Sinatra::Application.app_file.
|
||||
# Also, line numbers are zero-based in JRuby's parser
|
||||
vm.provider.runtime.current_context.set_file_and_line(app_file, 0)
|
||||
# Run the app
|
||||
vm.run_scriptlet org.jruby.embed.PathType::ABSOLUTE, app_file
|
||||
# terminate launches at_exit hooks which start server
|
||||
vm.terminate
|
||||
end
|
||||
end
|
||||
|
||||
def run
|
||||
return unless installed?
|
||||
kill
|
||||
@thread = start_vm
|
||||
@started = Time.now
|
||||
warn "#{server} up and running on port #{port}" if ping
|
||||
at_exit { kill }
|
||||
end
|
||||
|
||||
def log
|
||||
String.from_java_bytes @pipe.to_byte_array
|
||||
end
|
||||
|
||||
def kill
|
||||
@thread.kill if @thread
|
||||
@thread = nil
|
||||
end
|
||||
end
|
||||
Server = BaseServer
|
||||
else
|
||||
Server = BaseServer
|
||||
end
|
||||
Server = BaseServer
|
||||
|
||||
def it(message, &block)
|
||||
Server.each do |server|
|
||||
|
|
Loading…
Reference in New Issue