passenger 2.2.2 → 2.2.3

data/test/integration_tests/apache2_tests.rb

@@ -93,6 +93,18 @@ describe "mod_passenger running in Apache 2" do
 				end
 			end
 		end
+		
+		it "supports environment variable passing through mod_env" do
+			begin
+				File.open("#{@stub.app_root}/public/.htaccess", 'w') do |f|
+					f.puts 'SetEnv FOO "Foo Bar!"'
+				end
+				File.touch("#{@stub.app_root}/tmp/restart.txt")
+				get('/welcome/environment').should =~ /FOO = Foo Bar\!/
+			ensure
+				File.unlink("#{@stub.app_root}/public/.htaccess") rescue nil
+			end
+		end
 	end
 	
 	describe ": MyCook(tm) beta running in a sub-URI" do
@@ -199,7 +211,8 @@ describe "mod_passenger running in Apache 2" do
 					})
 				end
 				
-				File.open(restart_file, 'w').close
+				now = Time.now
+				File.touch(restart_file, now - 5)
 				get('/bar').should == "hello world"
 				
 				File.open(controller, 'w') do |f|
@@ -212,9 +225,7 @@ describe "mod_passenger running in Apache 2" do
 					})
 				end
 				
-				now = Time.now
-				File.open(restart_file, 'w').close
-				File.utime(now - 10, now - 10, restart_file)
+				File.touch(restart_file, now - 10)
 				get('/bar').should == "oh hai"
 			ensure
 				File.unlink(controller) rescue nil

data/test/integration_tests/mycook_spec.rb

@@ -124,8 +124,7 @@ shared_examples_for "MyCook(tm) beta" do
 					end
 				}
 			end
-			File.open(restart_file, 'w').close
-			File.utime(now - 10, now - 10, restart_file)
+			File.touch(restart_file, now - 10)
 			get('/test').should == "foo"
 			
 			File.open(controller, 'w') do |f|
@@ -139,7 +138,7 @@ shared_examples_for "MyCook(tm) beta" do
 				}
 			end
 
-			File.utime(now - 5, now - 5, restart_file)
+			File.touch(restart_file, now - 5)
 			get('/test').should == 'bar'
 		ensure
 			File.unlink(controller) rescue nil
@@ -165,7 +164,7 @@ shared_examples_for "MyCook(tm) beta" do
 			})
 		end
 		begin
-			system "touch '#{@stub.app_root}/tmp/restart.txt'"
+			File.touch("#{@stub.app_root}/tmp/restart.txt")
 			get('/welcome/passenger_name').should == 'Gourry Gabriev'
 		ensure
 			File.unlink("#{@stub.app_root}/app/models/passenger.rb") rescue nil

data/test/oxt/syscall_interruption_test.cpp

@@ -9,22 +9,10 @@ using namespace oxt;
 using namespace std;
 
 namespace tut {
-	struct SyscallInterruptionTest {
-		SyscallInterruptionTest() {
-			setup_syscall_interruption_support();
-		}
-		
-		~SyscallInterruptionTest() {
-			struct sigaction action;
-			
-			action.sa_handler = SIG_DFL;
-			action.sa_flags   = 0;
-			sigemptyset(&action.sa_mask);
-			sigaction(INTERRUPTION_SIGNAL, &action, NULL);
-		}
+	struct syscall_interruption_test {
 	};
 	
-	DEFINE_TEST_GROUP(SyscallInterruptionTest);
+	DEFINE_TEST_GROUP(syscall_interruption_test);
 	
 	struct SleepFunction {
 		void operator()() {

data/test/ruby/abstract_server_collection_spec.rb

@@ -63,7 +63,7 @@ describe AbstractServerCollection do
 		end
 	end
 	
-	specify "#delete stop the server if it's started" do
+	specify "#delete stops the server if it's started" do
 		@collection.synchronize do
 			server = AbstractServer.new
 			@collection.lookup_or_add('foo') do

data/test/ruby/abstract_server_spec.rb

@@ -1,4 +1,10 @@
-shared_examples_for "AbstractServer" do
+require 'support/config'
+
+require 'phusion_passenger/abstract_server'
+
+include PhusionPassenger
+
+shared_examples_for "an AbstractServer" do
 	it "doesn't crash if it's started and stopped multiple times" do
 		3.times do
 			# Give the server some time to install the
@@ -15,3 +21,31 @@ shared_examples_for "AbstractServer" do
 		lambda { @server.start }.should raise_error(AbstractServer::ServerAlreadyStarted)
 	end
 end
+
+describe AbstractServer do
+	before :each do
+		@server = AbstractServer.new
+	end
+	
+	after :each do
+		@server.stop if @server.started?
+	end
+	
+	it "reseeds the pseudo-random number generator after forking off a process" do
+		@server.send(:define_message_handler, :random_number, :handle_random_number)
+		@server.stub!(:handle_random_number).and_return do
+			@server.send(:client).write(rand.to_s)
+		end
+		
+		@server.start
+		@server.send(:server).write("random_number")
+		first_num = @server.send(:server).read
+		
+		@server.stop
+		@server.start
+		@server.send(:server).write("random_number")
+		second_num = @server.send(:server).read
+		
+		first_num.should_not == second_num
+	end
+end

data/test/ruby/rack/application_spawner_spec.rb

@@ -19,7 +19,7 @@ describe PhusionPassenger::Rack::ApplicationSpawner do
 	
 	it "propagates exceptions in application startup" do
 		File.prepend("#{@stub.app_root}/config.ru", "raise StandardError, 'foo'\n")
-		spawn = lambda { spawn(@stub.app_root) }
+		spawn = lambda { spawn(@stub.app_root, "print_exceptions" => false) }
 		spawn.should raise_error(StandardError)
 	end
 	
@@ -34,8 +34,25 @@ describe PhusionPassenger::Rack::ApplicationSpawner do
 		config_ru_owner.should == touch_txt_owner
 	end if Process.euid == 0
 	
+	it "sets the environment variables passed in the environment_variables option" do
+		File.append("#{@stub.app_root}/config.ru", %q{
+			File.open("env.txt", "w") do |f|
+				ENV.each_pair do |key, value|
+					f.puts("#{key} = #{value}")
+				end
+			end
+		})
+		env_vars_string = "PATH\0/usr/bin:/opt/sw/bin\0FOO\0foo bar!\0"
+		options = { "environment_variables" => [env_vars_string].pack("m") }
+		spawn(@stub.app_root, options).close
+		
+		contents = File.read("#{@stub.app_root}/env.txt")
+		contents.should =~ %r(PATH = /usr/bin:/opt/sw/bin\n)
+		contents.should =~ %r(FOO = foo bar\!\n)
+	end
+	
 	it "calls the starting_worker_process event after config.ru has been loaded" do
-	  File.append("#{@stub.app_root}/config.ru", %q{
+		File.append("#{@stub.app_root}/config.ru", %q{
 			PhusionPassenger.on_event(:starting_worker_process) do
 				File.append("rackresult.txt", "worker_process_started\n")
 			end
@@ -55,7 +72,7 @@ describe PhusionPassenger::Rack::ApplicationSpawner do
 	end
 	
 	it "calls the stopping_worker_process event" do
-	  File.append("#{@stub.app_root}/config.ru", %q{
+		File.append("#{@stub.app_root}/config.ru", %q{
 			PhusionPassenger.on_event(:stopping_worker_process) do
 				File.append("rackresult.txt", "worker_process_stopped\n")
 			end
@@ -74,9 +91,9 @@ describe PhusionPassenger::Rack::ApplicationSpawner do
 			"worker_process_stopped\n"
 	end	
 	
-	def spawn(app_root)
-		PhusionPassenger::Rack::ApplicationSpawner.spawn_application(app_root,
-			"lowest_user" => CONFIG['lowest_user'])
+	def spawn(app_root, extra_options = {})
+		options = { "lowest_user" => CONFIG['lowest_user'] }.merge(extra_options)
+		PhusionPassenger::Rack::ApplicationSpawner.spawn_application(app_root, options)
 	end
 end
 

data/test/ruby/rails/application_spawner_spec.rb

@@ -69,9 +69,9 @@ describe ApplicationSpawner do
 			end
 		end
 		
-		def spawn_stub_application(stub)
-			@spawner = ApplicationSpawner.new(stub.app_root,
-				"lowest_user" => CONFIG['lowest_user'])
+		def spawn_stub_application(stub, extra_options = {})
+			options = { "lowest_user" => CONFIG['lowest_user'] }.merge(extra_options)
+			@spawner = ApplicationSpawner.new(stub.app_root, options)
 			begin
 				@spawner.start
 				return @spawner.spawn_application
@@ -107,9 +107,9 @@ describe ApplicationSpawner do
 			end
 		end
 		
-		def spawn_stub_application(stub)
-			@spawner = ApplicationSpawner.new(stub.app_root,
-				"lowest_user" => CONFIG['lowest_user'])
+		def spawn_stub_application(stub, extra_options = {})
+			options = { "lowest_user" => CONFIG['lowest_user'] }.merge(extra_options)
+			@spawner = ApplicationSpawner.new(stub.app_root, options)
 			return @spawner.spawn_application!
 		end
 	end

data/test/ruby/rails/framework_spawner_spec.rb

@@ -76,7 +76,7 @@ describe FrameworkSpawner do
 		it_should_behave_like "handling errors in framework initialization"
 	end
 	
-	def spawn_stub_application(stub)
+	def spawn_stub_application(stub, extra_options = {})
 		if use_vendor_rails?
 			stub.use_vendor_rails('minimal')
 		end
@@ -86,18 +86,19 @@ describe FrameworkSpawner do
 		else
 			options = { :version => version }
 		end
+		options["lowest_user"] = CONFIG['lowest_user']
+		options = options.merge(extra_options)
 		spawner = FrameworkSpawner.new(options)
 		spawner.start
 		begin
-			return spawner.spawn_application(stub.app_root,
-				"lowest_user" => CONFIG['lowest_user'])
+			return spawner.spawn_application(stub.app_root, options)
 		ensure
 			spawner.stop
 		end
 	end
 	
-	def load_nonexistant_framework
-		spawner = FrameworkSpawner.new(:version => "1.9.827")
+	def load_nonexistant_framework(options = {})
+		spawner = FrameworkSpawner.new(options.merge(:version => "1.9.827"))
 		begin
 			spawner.start
 		ensure

data/test/ruby/rails/minimal_spawner_spec.rb

@@ -71,4 +71,23 @@ shared_examples_for "a minimal spawner" do
 			lambda { spawn_stub_application(stub).close }.should_not raise_error
 		end
 	end
+	
+	it "sets the environment variables passed in the environment_variables option" do
+		use_rails_stub('foobar') do |stub|
+			File.append(stub.environment_rb, %q{
+				File.open("env.txt", "w") do |f|
+					ENV.each_pair do |key, value|
+						f.puts("#{key} = #{value}")
+					end
+				end
+			})
+			env_vars_string = "PATH\0/usr/bin:/opt/sw/bin\0FOO\0foo bar!\0"
+			options = { "environment_variables" => [env_vars_string].pack("m") }
+			spawn_stub_application(stub, options).close
+			
+			contents = File.read("#{stub.app_root}/env.txt")
+			contents.should =~ %r(PATH = /usr/bin:/opt/sw/bin\n)
+			contents.should =~ %r(FOO = foo bar\!\n)
+		end
+	end
 end

data/test/ruby/rails/spawner_error_handling_spec.rb

@@ -1,3 +1,5 @@
+require 'stringio'
+
 shared_examples_for "handling errors in application initialization" do
 	before :each do
 		@stub = setup_rails_stub('foobar')
@@ -11,8 +13,8 @@ shared_examples_for "handling errors in application initialization" do
 	it "raises an AppInitError if the spawned app raises a standard exception during startup" do
 		File.prepend(@stub.environment_rb, "raise 'This is a dummy exception.'\n")
 		begin
-			spawn_stub_application(@stub).close
-			violated "Spawning the application should have raised an InitializationError."
+			spawn_stub_application(@stub, "print_exceptions" => false).close
+			violated "Spawning the application should have raised an AppInitError."
 		rescue AppInitError => e
 			e.child_exception.message.should == "This is a dummy exception."
 		end
@@ -26,8 +28,8 @@ shared_examples_for "handling errors in application initialization" do
 			raise MyError, "This is a custom exception."
 		})
 		begin
-			spawn_stub_application(@stub).close
-			violated "Spawning the application should have raised an InitializationError."
+			spawn_stub_application(@stub, "print_exceptions" => false).close
+			violated "Spawning the application should have raised an AppInitError."
 		rescue AppInitError => e
 			e.child_exception.message.should == "This is a custom exception. (MyError)"
 		end
@@ -36,17 +38,70 @@ shared_examples_for "handling errors in application initialization" do
 	it "raises an AppInitError if the spawned app calls exit() during startup" do
 		File.prepend(@stub.environment_rb, "exit\n")
 		begin
-			spawn_stub_application(@stub).close
-			violated "Spawning the application should have raised an InitializationError."
+			spawn_stub_application(@stub, "print_exceptions" => false).close
+			violated "Spawning the application should have raised an AppInitError."
 		rescue AppInitError => e
 			e.child_exception.class.should == SystemExit
 		end
 	end
+	
+	it "prints the exception to STDERR if the spawned app raised an error" do
+		old_stderr = STDERR
+		file = File.new('output.tmp', 'w+')
+		begin
+			Object.send(:remove_const, "STDERR") rescue nil
+			Object.const_set("STDERR", file)
+			
+			File.prepend(@stub.environment_rb, "raise 'This is a dummy exception.'\n")
+			block = lambda do
+				spawn_stub_application(@stub).close
+			end
+			block.should raise_error(AppInitError)
+			
+			file.rewind
+			data = file.read
+			data.should =~ /spawn_stub_application/
+			data.should =~ /spawner_error_handling_spec\.rb/
+		ensure
+			Object.send(:remove_const, "STDERR") rescue nil
+			Object.const_set("STDERR", old_stderr)
+			file.close rescue nil
+			File.unlink('output.tmp') rescue nil
+		end
+	end
 end
 
 shared_examples_for "handling errors in framework initialization" do
 	include Utils
+	
 	it "raises FrameworkInitError if the framework could not be loaded" do
-		lambda { load_nonexistant_framework.close }.should raise_error(FrameworkInitError)
+		block = lambda do
+			load_nonexistant_framework(:print_framework_loading_exceptions => false).close
+		end
+		block.should raise_error(FrameworkInitError)
+	end
+	
+	it "prints the exception to STDERR if the framework could not be loaded" do
+		old_stderr = STDERR
+		file = File.new('output.tmp', 'w+')
+		begin
+			Object.send(:remove_const, "STDERR") rescue nil
+			Object.const_set("STDERR", file)
+			
+			block = lambda do
+				load_nonexistant_framework.close
+			end
+			block.should raise_error(FrameworkInitError)
+			
+			file.rewind
+			data = file.read
+			data.should =~ /load_nonexistant_framework/
+			data.should =~ /spawner_error_handling_spec\.rb/
+		ensure
+			Object.send(:remove_const, "STDERR") rescue nil
+			Object.const_set("STDERR", old_stderr)
+			file.close rescue nil
+			File.unlink('output.tmp') rescue nil
+		end
 	end
 end

data/test/ruby/spawn_manager_spec.rb

@@ -1,5 +1,6 @@
 require 'support/config'
 require 'support/test_helper'
+require 'phusion_passenger/application'
 require 'phusion_passenger/spawn_manager'
 
 require 'ruby/abstract_server_spec'
@@ -32,7 +33,7 @@ describe SpawnManager do
 			@spawn_method = "smart"
 		end
 		
-		it_should_behave_like "AbstractServer"
+		it_should_behave_like "an AbstractServer"
 	end
 	
 	describe "conservative spawning" do
@@ -40,7 +41,7 @@ describe SpawnManager do
 			@spawn_method = "conservative"
 		end
 		
-		it_should_behave_like "AbstractServer"
+		it_should_behave_like "an AbstractServer"
 	end
 	
 	def spawn_arbitrary_application
@@ -169,19 +170,21 @@ describe SpawnManager do
 	it_should_behave_like "handling errors in application initialization"
 	it_should_behave_like "handling errors in framework initialization"
 	
-	def spawn_stub_application(stub)
+	def spawn_stub_application(stub, extra_options = {})
 		spawner = SpawnManager.new
 		begin
-			return spawner.spawn_application(
+			options = {
 				"app_root" => stub.app_root,
 				"spawn_method" => @spawn_method,
-				"lowest_user" => CONFIG['lowest_user'])
+				"lowest_user" => CONFIG['lowest_user']
+			}.merge(extra_options)
+			return spawner.spawn_application(options)
 		ensure
 			spawner.cleanup
 		end
 	end
 	
-	def load_nonexistant_framework
+	def load_nonexistant_framework(extra_options = {})
 		# Prevent detect_framework_version from raising VersionNotFound
 		Application.instance_eval do
 			alias orig_detect_framework_version detect_framework_version
@@ -192,7 +195,7 @@ describe SpawnManager do
 		begin
 			File.write(@stub.environment_rb, "RAILS_GEM_VERSION = '1.9.827'")
 			@stub.dont_use_vendor_rails
-			return spawn_stub_application(@stub)
+			return spawn_stub_application(@stub, extra_options)
 		ensure
 			Application.instance_eval do
 				alias detect_framework_version orig_detect_framework_version