passenger 3.9.2.beta → 4.0.0.rc4

data/test/integration_tests/hello_world_wsgi_spec.rb

@@ -8,11 +8,11 @@ shared_examples_for "HelloWorld WSGI application" do
 	end
 	
 	it "is possible to GET a regular WSGI page" do
-		get('/').should =~ /Hello World/
+		get('/').should include("hello <b>world</b>")
 	end
 	
 	it "supports restarting via restart.txt" do
-		get('/').should =~ /Hello World/
+		get('/').should include("hello <b>world</b>")
 		
 		code = %q{
 			def application(env, start_response):

data/test/integration_tests/mycook_spec.rb

@@ -148,7 +148,7 @@ shared_examples_for "MyCook(tm) beta" do
 	
 	it "sets the 'Status' header" do
 		response = get_response('/nonexistant')
-		response["Status"].should == "404"
+		response["Status"].should == "404 Not Found"
 	end
 	
 	if Process.uid == 0

data/test/integration_tests/nginx_tests.rb

@@ -13,20 +13,12 @@ describe "Phusion Passenger for Nginx" do
 		end
 		
 		check_hosts_configuration
-		@nginx = NginxController.new("tmp.nginx")
-		if Process.uid == 0
-			@nginx.set(
-				:www_user => CONFIG['normal_user_1'],
-				:www_group => Etc.getgrgid(Etc.getpwnam(CONFIG['normal_user_1']).gid).name
-			)
-		end
-		
 		FileUtils.mkdir_p("tmp.nginx")
 	end
 	
 	after :all do
 		begin
-			@nginx.stop
+			@nginx.stop if @nginx
 		ensure
 			FileUtils.rm_rf("tmp.nginx")
 		end
@@ -36,15 +28,26 @@ describe "Phusion Passenger for Nginx" do
 		File.open("test.log", "a") do |f|
 			# Make sure that all Nginx log output is prepended by the test description
 			# so that we know which messages are associated with which tests.
-			f.puts "\n#### #{self.class.description} : #{description}"
+			f.puts "\n#### #{Time.now}: #{example.full_description}"
 		end
 	end
-	
+
+	def create_nginx_controller(options = {})
+		@nginx = NginxController.new("tmp.nginx")
+		if Process.uid == 0
+			@nginx.set({
+				:www_user => CONFIG['normal_user_1'],
+				:www_group => Etc.getgrgid(Etc.getpwnam(CONFIG['normal_user_1']).gid).name
+			}.merge(options))
+		end
+	end
+
 	describe "MyCook(tm) beta running a root URI" do
 		before :all do
+			create_nginx_controller
 			@server = "http://1.passenger.test:#{@nginx.port}"
 			@base_uri = ""
-			@stub = RailsStub.new('2.3/mycook')
+			@stub = ClassicRailsStub.new('rails_apps/2.3/mycook')
 			@nginx.add_server do |server|
 				server[:server_name] = "1.passenger.test"
 				server[:root]        = "#{@stub.full_app_root}/public"
@@ -54,6 +57,7 @@ describe "Phusion Passenger for Nginx" do
 		
 		after :all do
 			@stub.destroy
+			@nginx.stop if @nginx
 		end
 		
 		before :each do
@@ -61,18 +65,19 @@ describe "Phusion Passenger for Nginx" do
 		end
 		
 		it_should_behave_like "MyCook(tm) beta"
-		include_shared_example_group "CGI environment variables compliance"
+		include_examples "CGI environment variables compliance"
 	end
 	
 	describe "MyCook(tm) beta running in a sub-URI" do
 		before :all do
 			@base_uri = "/mycook"
-			@stub = RailsStub.new('2.3/mycook')
+			@stub = ClassicRailsStub.new('rails_apps/2.3/mycook')
 			FileUtils.rm_rf('tmp.webdir')
 			FileUtils.mkdir_p('tmp.webdir')
 			FileUtils.cp_r('stub/zsfa/.', 'tmp.webdir')
 			FileUtils.ln_sf(@stub.full_app_root + "/public", 'tmp.webdir/mycook')
 			
+			create_nginx_controller
 			@nginx.add_server do |server|
 				server[:server_name] = "1.passenger.test"
 				server[:root]        = File.expand_path("tmp.webdir")
@@ -84,15 +89,16 @@ describe "Phusion Passenger for Nginx" do
 		after :all do
 			FileUtils.rm_rf('tmp.webdir')
 			@stub.destroy
+			@nginx.stop if @nginx
 		end
 		
 		before :each do
 			@server = "http://1.passenger.test:#{@nginx.port}/mycook"
 			@stub.reset
 		end
-		
+
 		it_should_behave_like "MyCook(tm) beta"
-		include_shared_example_group "CGI environment variables compliance"
+		include_examples "CGI environment variables compliance"
 		
 		it "does not interfere with the root website" do
 			@server = "http://1.passenger.test:#{@nginx.port}"
@@ -102,6 +108,7 @@ describe "Phusion Passenger for Nginx" do
 	
 	describe "Rack application running in root URI" do
 		before :all do
+			create_nginx_controller
 			@server = "http://passenger.test:#{@nginx.port}"
 			@stub = RackStub.new('rack')
 			@nginx.add_server do |server|
@@ -114,6 +121,7 @@ describe "Phusion Passenger for Nginx" do
 		
 		after :all do
 			@stub.destroy
+			@nginx.stop if @nginx
 		end
 		
 		before :each do
@@ -128,6 +136,7 @@ describe "Phusion Passenger for Nginx" do
 			FileUtils.rm_rf('tmp.webdir')
 			FileUtils.mkdir_p('tmp.webdir')
 			@stub = RackStub.new('rack')
+			create_nginx_controller
 			@nginx.add_server do |server|
 				FileUtils.ln_s(@stub.full_app_root + "/public", 'tmp.webdir/rack')
 				server[:server_name] = "passenger.test"
@@ -141,6 +150,7 @@ describe "Phusion Passenger for Nginx" do
 		after :all do
 			@stub.destroy
 			FileUtils.rm_rf('tmp.webdir')
+			@nginx.stop if @nginx
 		end
 		
 		before :each do
@@ -152,8 +162,9 @@ describe "Phusion Passenger for Nginx" do
 	
 	describe "Rack application running within Rails directory structure" do
 		before :all do
+			create_nginx_controller
 			@server = "http://passenger.test:#{@nginx.port}"
-			@stub = RailsStub.new('2.3/mycook')
+			@stub = ClassicRailsStub.new('rails_apps/2.3/mycook')
 			FileUtils.cp_r("stub/rack/.", @stub.app_root)
 			@nginx.add_server do |server|
 			server[:server_name] = "passenger.test"
@@ -164,6 +175,7 @@ describe "Phusion Passenger for Nginx" do
 		
 		after :all do
 			@stub.destroy
+			@nginx.stop if @nginx
 		end
 		
 		before :each do
@@ -176,6 +188,7 @@ describe "Phusion Passenger for Nginx" do
 	
 	describe "various features" do
 		before :all do
+			create_nginx_controller
 			@server = "http://passenger.test:#{@nginx.port}"
 			@stub = RackStub.new('rack')
 			@nginx.add_server do |server|
@@ -203,6 +216,7 @@ describe "Phusion Passenger for Nginx" do
 		
 		after :all do
 			@stub.destroy
+			@nginx.stop if @nginx
 		end
 		
 		before :each do
@@ -263,8 +277,8 @@ describe "Phusion Passenger for Nginx" do
 	end
 	
 	describe "oob work" do
-		
 		before :all do
+			create_nginx_controller
 			@server = "http://passenger.test:#{@nginx.port}"
 			@stub = RackStub.new('rack')
 			@nginx.add_server do |server|
@@ -272,6 +286,11 @@ describe "Phusion Passenger for Nginx" do
 				server[:root]        = "#{@stub.full_app_root}/public"
 			end
 		end
+
+		after :all do
+			@stub.destroy
+			@nginx.stop if @nginx
+		end
 		
 		before :each do
 			@stub.reset
@@ -308,7 +327,6 @@ describe "Phusion Passenger for Nginx" do
 			secs = Time.now - t0
 			secs.should <= 0.1
 		end
-		
 	end
 	
 	##### Helper methods #####

data/test/ruby/request_handler_spec.rb

@@ -214,6 +214,7 @@ describe RequestHandler do
 			send_binary_request(client,
 				"REQUEST_METHOD" => "GET",
 				"PATH_INFO" => "/")
+			sleep 0.1 # Give it some time to handle the request.
 			stop_request_handler
 			client.read.should == "Hijacked response!"
 		ensure

data/test/ruby/spec_helper.rb

@@ -22,11 +22,14 @@ AGENTS_DIR = "#{source_root}/agents"
 $LOAD_PATH.unshift("#{source_root}/lib")
 $LOAD_PATH.unshift("#{source_root}/test")
 
+require 'thread'
+require 'timeout'
 require 'fileutils'
 require 'support/test_helper'
 require 'phusion_passenger'
 PhusionPassenger.locate_directories
 require 'phusion_passenger/debug_logging'
+require 'phusion_passenger/utils'
 require 'phusion_passenger/utils/tmpdir'
 
 include TestHelper
@@ -36,9 +39,54 @@ include TestHelper
 srand
 
 trap "QUIT" do
-	puts caller
+	STDERR.puts PhusionPassenger::Utils.global_backtrace_report
 end
 
+class DeadlineTimer
+	def initialize(main_thread, deadline)
+		@mutex = Mutex.new
+		@cond  = ConditionVariable.new
+		@iteration = 0
+		@pipe  = IO.pipe
+
+		@thread = Thread.new do
+			Thread.current.abort_on_exception = true
+			expected_iteration = 1
+			ios = [@pipe[0]]
+			while true
+				@mutex.synchronize do
+					while @iteration != expected_iteration
+						@cond.wait(@mutex)
+					end
+				end
+				if !select(ios, nil, nil, deadline)
+					STDERR.puts "*** Test timed out (#{deadline} seconds)"
+					STDERR.puts PhusionPassenger::Utils.global_backtrace_report
+					main_thread.raise(Timeout::Error, "Test timed out")
+					expected_iteration += 1
+				elsif @pipe[0].read(1).nil?
+					break
+				else
+					expected_iteration += 1
+				end
+			end
+		end
+	end
+
+	def start
+		@mutex.synchronize do
+			@iteration += 1
+			@cond.signal
+		end
+	end
+
+	def stop
+		@pipe[1].write('x')
+	end
+end
+
+DEADLINE_TIMER = DeadlineTimer.new(Thread.current, 30)
+
 RSpec.configure do |config|
 	config.before(:each) do
 		# Suppress warning messages.
@@ -48,6 +96,8 @@ RSpec.configure do |config|
 		
 		# Create the temp directory.
 		PhusionPassenger::Utils.passenger_tmpdir
+
+		DEADLINE_TIMER.start
 	end
 	
 	config.after(:each) do
@@ -55,5 +105,6 @@ RSpec.configure do |config|
 		if File.exist?(tmpdir)
 			remove_dir_tree(tmpdir)
 		end
+		DEADLINE_TIMER.stop
 	end
 end

data/test/stub/nginx/nginx.conf.erb

@@ -22,6 +22,8 @@ http {
     passenger_ruby <%= PlatformInfo.ruby_command %>;
     passenger_default_user <%= CONFIG['default_user'] %>;
     passenger_default_group <%= CONFIG['default_group'] %>;
+    passenger_max_pool_size <%= @max_pool_size %>;
+    passenger_log_level 3;
 
     <% for server in @servers %>
         server {

data/test/stub/rack/start.rb

@@ -12,6 +12,11 @@ while (line = STDIN.readline) != "\n"
 	options[name] = value
 end
 
+if ARGV[0] == "--execself"
+	# Used for testing https://code.google.com/p/phusion-passenger/issues/detail?id=842#c19
+	exec("ruby", $0)
+end
+
 server = TCPServer.new('127.0.0.1', 0)
 puts "!> Ready"
 puts "!> socket: main;tcp://127.0.0.1:#{server.addr[1]};session;1"

data/test/stub/rails3.0/Gemfile.lock

@@ -2,12 +2,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.15)
-      actionpack (= 3.0.15)
+    actionmailer (3.0.20)
+      actionpack (= 3.0.20)
       mail (~> 2.2.19)
-    actionpack (3.0.15)
-      activemodel (= 3.0.15)
-      activesupport (= 3.0.15)
+    actionpack (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -15,62 +15,62 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.15)
-      activesupport (= 3.0.15)
+    activemodel (3.0.20)
+      activesupport (= 3.0.20)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.15)
-      activemodel (= 3.0.15)
-      activesupport (= 3.0.15)
+    activerecord (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.15)
-      activemodel (= 3.0.15)
-      activesupport (= 3.0.15)
-    activesupport (3.0.15)
+    activeresource (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+    activesupport (3.0.20)
     arel (2.0.10)
     builder (2.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     i18n (0.5.0)
-    json (1.7.3)
+    json (1.7.6)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.18)
+    mime-types (1.20.1)
     polyglot (0.3.3)
-    rack (1.2.5)
+    rack (1.2.7)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.15)
-      actionmailer (= 3.0.15)
-      actionpack (= 3.0.15)
-      activerecord (= 3.0.15)
-      activeresource (= 3.0.15)
-      activesupport (= 3.0.15)
+    rails (3.0.20)
+      actionmailer (= 3.0.20)
+      actionpack (= 3.0.20)
+      activerecord (= 3.0.20)
+      activeresource (= 3.0.20)
+      activesupport (= 3.0.20)
       bundler (~> 1.0)
-      railties (= 3.0.15)
-    railties (3.0.15)
-      actionpack (= 3.0.15)
-      activesupport (= 3.0.15)
+      railties (= 3.0.20)
+    railties (3.0.20)
+      actionpack (= 3.0.20)
+      activesupport (= 3.0.20)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.9.2.2)
+    rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
     sqlite3 (1.3.6)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
     thor (0.14.6)
-    treetop (1.4.10)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby

data/test/stub/rails3.1/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.1.10'
+gem 'rails', '~> 3.1.10'
 
 # Bundle edge Rails instead:
 # gem 'rails',     :git => 'git://github.com/rails/rails.git'

data/test/stub/rails3.1/Gemfile.lock

@@ -51,7 +51,7 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
+    mime-types (1.20.1)
     multi_json (1.2.0)
     polyglot (0.3.3)
     rack (1.3.9)
@@ -59,7 +59,7 @@ GEM
       rack (>= 0.4)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -109,7 +109,7 @@ DEPENDENCIES
   coffee-rails (~> 3.1.1)
   jquery-rails
   json
-  rails (= 3.1.10)
+  rails (~> 3.1.10)
   sass-rails (~> 3.1.5)
   sqlite3
   uglifier (>= 1.0.3)