passenger 4.0.60 → 5.0.0.beta1

data/test/integration_tests/nginx_tests.rb

@@ -1,5 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
 require 'support/nginx_controller'
+
+WEB_SERVER_DECHUNKS_REQUESTS = true
+
 require 'integration_tests/shared/example_webapp_tests'
 
 describe "Phusion Passenger for Nginx" do
@@ -26,6 +29,20 @@ describe "Phusion Passenger for Nginx" do
 			# 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#### #{Time.now}: #{example.full_description}"
+			@test_log_pos = f.pos
+		end
+	end
+
+	after :each do
+		log "End of test"
+		if example.exception
+			puts "\t---------------- Begin logs -------------------"
+			File.open("test.log", "r") do |f|
+				f.seek(@test_log_pos)
+				puts f.read.split("\n").map{ |line| "\t#{line}" }.join("\n")
+			end
+			puts "\t---------------- End logs -------------------"
+			puts "\tThe following test failed. The web server logs are printed above."
 		end
 	end
 
@@ -39,6 +56,12 @@ describe "Phusion Passenger for Nginx" do
 		end
 	end
 
+	def log(message)
+		File.open("test.log", "a") do |f|
+			f.puts "[#{Time.now}] Spec: #{message}"
+		end
+	end
+
 	describe "a Ruby app running on the root URI" do
 		before :all do
 			create_nginx_controller
@@ -231,10 +254,11 @@ describe "Phusion Passenger for Nginx" do
 			create_nginx_controller
 			@server = "http://1.passenger.test:#{@nginx.port}"
 			@stub = RackStub.new('rack')
-			@nginx.set(:passenger_load_shell_envvars => 'off')
+			@nginx.set(:stat_throttle_rate => 0)
 			@nginx.add_server do |server|
 				server[:server_name] = "1.passenger.test"
 				server[:root]        = "#{@stub.full_app_root}/public"
+				server[:passenger_load_shell_envvars] = "off"
 				server[:passenger_friendly_error_pages] = "on"
 				server << %q{
 					location /crash_without_friendly_error_page {
@@ -247,12 +271,13 @@ describe "Phusion Passenger for Nginx" do
 				server[:server_name] = "2.passenger.test"
 				server[:root]        = "#{@stub.full_app_root}/public"
 				server[:passenger_app_group_name] = "secondary"
-				server[:passenger_show_version_in_header] = "off"
+				server[:passenger_load_shell_envvars] = "off"
 			end
 			@nginx.add_server do |server|
 				server[:server_name] = "3.passenger.test"
 				server[:passenger_app_group_name] = "tertiary"
 				server[:root]        = "#{@stub.full_app_root}/public"
+				server[:passenger_load_shell_envvars] = "off"
 				server[:passenger_max_requests] = 3
 			end
 			@nginx.start
@@ -304,13 +329,6 @@ describe "Phusion Passenger for Nginx" do
 			response["X-Powered-By"].should include(PhusionPassenger::VERSION_STRING)
 		end
 
-		it "omits the version number in X-Powered-By when passenger_show_version_in_header is off" do
-			@server = "http://2.passenger.test:#{@nginx.port}/"
-			response = get_response('/')
-			response["X-Powered-By"].should include("Phusion Passenger")
-			response["X-Powered-By"].should_not include(PhusionPassenger::VERSION_STRING)
-		end
-
 		it "respawns the app after handling max_requests requests" do
 			@server = "http://3.passenger.test:#{@nginx.port}/"
 			pid = get("/pid")
@@ -348,7 +366,7 @@ describe "Phusion Passenger for Nginx" do
 				end
 				app = lambda do |env|
 					if env['PATH_INFO'] == '/oobw'
-						[200, { "Content-Type" => "text/html", "X-Passenger-Request-OOB-Work" => 'true' }, [$$]]
+						[200, { "Content-Type" => "text/html", "!~Request-OOB-Work" => 'true' }, [$$]]
 					else
 						[200, { "Content-Type" => "text/html" }, [$$]]
 					end

data/test/integration_tests/shared/example_webapp_tests.rb

@@ -59,7 +59,8 @@ shared_examples_for "an example web app" do
 		begin
 			# For some reason the WSGI stub app does not accept the multipart data generated by
 			# post(), so we use curl instead.
-			command = "curl --silent -F name1=Kotonoha -F name2=Sekai -F data=@stub/garbage1.dat #{@server}/upload_with_params"
+			command = "curl --silent --fail -F name1=Kotonoha -F name2=Sekai -F data=@stub/garbage1.dat " +
+				"#{@server}/upload_with_params"
 			response = IO.popen(command, "rb") do |io|
 				io.read
 			end
@@ -77,7 +78,7 @@ shared_examples_for "an example web app" do
 			@uri = URI.parse(@server)
 		end
 
-		it "dechunks the request body for the app" do
+		it "correctly forwards the request body to the app" do
 			socket = TCPSocket.new(@uri.host, @uri.port)
 			begin
 				socket.write("POST #{base_uri}/raw_upload_to_file HTTP/1.1\r\n")
@@ -101,26 +102,28 @@ shared_examples_for "an example web app" do
 			File.read(@stub.full_app_root + "/output.txt").should == "foo=bar!"
 		end
 
-		it "sets Content-Length and removes Transfer-Encoding in the request" do
-			socket = TCPSocket.new(@uri.host, @uri.port)
-			begin
-				socket.write("POST #{base_uri}/env HTTP/1.1\r\n")
-				socket.write("Host: #{@uri.host}:#{@uri.port}\r\n")
-				socket.write("Transfer-Encoding: chunked\r\n")
-				socket.write("Content-Type: text/plain\r\n")
-				socket.write("Connection: close\r\n")
-				socket.write("\r\n")
-
-				chunk = "foo=bar!"
-				socket.write("%X\r\n%s\r\n" % [chunk.size, chunk])
-				socket.write("0\r\n\r\n")
-				socket.flush
-
-				response = socket.read
-				response.should include("CONTENT_LENGTH = 8\n")
-				response.should_not include("HTTP_TRANSFER_ENCODING = ")
-			ensure
-				socket.close
+		if WEB_SERVER_DECHUNKS_REQUESTS
+			it "sets Content-Length and removes Transfer-Encoding in the request" do
+				socket = TCPSocket.new(@uri.host, @uri.port)
+				begin
+					socket.write("POST #{base_uri}/env HTTP/1.1\r\n")
+					socket.write("Host: #{@uri.host}:#{@uri.port}\r\n")
+					socket.write("Transfer-Encoding: chunked\r\n")
+					socket.write("Content-Type: text/plain\r\n")
+					socket.write("Connection: close\r\n")
+					socket.write("\r\n")
+
+					chunk = "foo=bar!"
+					socket.write("%X\r\n%s\r\n" % [chunk.size, chunk])
+					socket.write("0\r\n\r\n")
+					socket.flush
+
+					response = socket.read
+					response.should include("CONTENT_LENGTH = 8\n")
+					response.should_not include("HTTP_TRANSFER_ENCODING = ")
+				ensure
+					socket.close
+				end
 			end
 		end
 	end
@@ -192,11 +195,12 @@ shared_examples_for "an example web app" do
 			upload_data = File.read("stub/upload_data.txt")
 			size_of_first_half = upload_data.size / 2
 
-			socket.write("POST #{base_uri}/ HTTP/1.1\r\n")
+			socket.write("POST #{base_uri}/raw_upload_to_file HTTP/1.1\r\n")
 			socket.write("Host: #{uri.host}:#{uri.port}\r\n")
 			socket.write("Content-Type: multipart/form-data\r\n")
 			socket.write("Content-Length: #{upload_data.size}\r\n")
 			socket.write("Connection: close\r\n")
+			socket.write("X-Output: /dev/null\r\n")
 			socket.write("\r\n")
 
 			socket.write(upload_data[0 .. size_of_first_half - 1])
@@ -208,7 +212,7 @@ shared_examples_for "an example web app" do
 
 			socket.write(upload_data[0 .. size_of_first_half])
 			socket.flush
-			socket.read.should =~ /front page/
+			socket.read.should =~ /ok\Z/
 		ensure
 			socket.close rescue nil
 		end
@@ -224,24 +228,33 @@ shared_examples_for "an example web app" do
 
 		begin
 			5.times do |i|
+				log "Begin sending request #{i}"
 				socket = TCPSocket.new(uri.host, uri.port)
 				sockets << socket
-				socket.write("POST #{base_uri}/ HTTP/1.1\r\n")
+				socket.write("POST #{base_uri}/raw_upload_to_file HTTP/1.1\r\n")
 				socket.write("Host: #{uri.host}:#{uri.port}\r\n")
 				socket.write("Content-Type: multipart/form-data\r\n")
 				socket.write("Content-Length: #{upload_data.size}\r\n")
 				socket.write("Connection: close\r\n")
+				socket.write("X-Index: #{i}\r\n")
+				socket.write("X-Output: /dev/null\r\n")
 				socket.write("\r\n")
 				socket.write(upload_data[0 .. size_of_first_half - 1])
 				socket.flush
 			end
+			log "Reading front page"
 			Timeout.timeout(10) do
 				get('/').should == "front page"
 			end
-			sockets.each do |socket|
+			sockets.each_with_index do |socket, i|
+				log "Resuming request #{i}"
 				socket.write(upload_data[size_of_first_half .. -1])
 				socket.flush
-				socket.read.should =~ /front page/
+				log "Completely sent request #{i}; reading response"
+				content = socket.read
+				if content !~ /ok\Z/
+					raise "Connection #{i} did not send a correct response:\n#{content}"
+				end
 			end
 		ensure
 			sockets.each do |socket|

data/test/integration_tests/standalone_tests.rb

@@ -20,18 +20,10 @@ ENV['PASSENGER_COMPILE_NATIVE_SUPPORT_BINARY']  = '0'
 module PhusionPassenger
 
 describe "Passenger Standalone" do
-	after :each do
-		ENV.delete('PASSENGER_DEBUG')
-	end
-
 	let(:version) { PhusionPassenger::VERSION_STRING }
 	let(:nginx_version) { PhusionPassenger::PREFERRED_NGINX_VERSION }
 	let(:compat_id) { PhusionPassenger::PlatformInfo.cxx_binary_compatibility_id }
 
-	def use_binaries_from_source_root!
-		ENV['PASSENGER_DEBUG'] = '1'
-	end
-
 	def sh(*command)
 		if !system(*command)
 			abort "Command failed: #{command.join(' ')}"
@@ -77,14 +69,12 @@ describe "Passenger Standalone" do
 	end
 
 	def create_dummy_support_binaries
-		Dir.mkdir("agents") if !File.exist?("agents")
-		["PassengerWatchdog", "PassengerHelperAgent", "PassengerLoggingAgent"].each do |exe|
-			File.open("agents/#{exe}", "w") do |f|
-				f.puts "#!/bin/bash"
-				f.puts "echo PASS"
-			end
-			File.chmod(0755, "agents/#{exe}")
+		Dir.mkdir("support-binaries") if !File.exist?("support-binaries")
+		File.open("support-binaries/#{AGENT_EXE}", "w") do |f|
+			f.puts "#!/bin/bash"
+			f.puts "echo PASS"
 		end
+		File.chmod(0755, "support-binaries/#{AGENT_EXE}")
 	end
 
 	def create_dummy_nginx_binary
@@ -117,198 +107,271 @@ describe "Passenger Standalone" do
 	end
 
 	describe "start command" do
-		SUPPORT_BINARIES_DOWNLOAD_MESSAGE = "--> Downloading #{PROGRAM_NAME} support binaries for your platform"
-		NGINX_BINARY_DOWNLOAD_MESSAGE = "Downloading web helper for your platform"
-		NGINX_SOURCE_DOWNLOAD_MESSAGE = "Downloading web helper source code..."
-		COMPILING_MESSAGE = "Installing #{PROGRAM_NAME} Standalone..."
+		AGENT_BINARY_DOWNLOAD_MESSAGE = "--> Downloading a #{PROGRAM_NAME} agent binary for your platform"
+		AGENT_BINARY_COMPILE_MESSAGE  = "Compiling #{PROGRAM_NAME} agent"
+		NGINX_BINARY_INSTALL_MESSAGE  = "Installing Nginx"
 
 		def test_serving_application(passenger_command)
-			Dir.chdir(@runtime_dir) do
-				File.open("config.ru", "w") do |f|
-					f.write(%Q{
-						app = lambda do |env|
-							[200, { "Content-Type" => "text/plain" }, ["ok"]]
+			Dir.mktmpdir do |tmpdir|
+				Dir.chdir(tmpdir) do
+					File.open("config.ru", "w") do |f|
+						f.write(%Q{
+							app = lambda do |env|
+								[200, { "Content-Type" => "text/plain" }, ["ok"]]
+							end
+							run app
+						})
+					end
+					Dir.mkdir("public")
+					Dir.mkdir("tmp")
+					sh("#{passenger_command} -p 4000 -d --disable-turbocaching >/dev/null")
+					begin
+						open("http://127.0.0.1:4000/") do |f|
+							f.read.should == "ok"
 						end
-						run app
-					})
-				end
-				Dir.mkdir("public")
-				Dir.mkdir("tmp")
-				sh("#{passenger_command} -p 4000 -d >/dev/null")
-				begin
-					open("http://127.0.0.1:4000/") do |f|
-						f.read.should == "ok"
+					ensure
+						sh("passenger stop -p 4000")
 					end
-				ensure
-					sh("passenger stop -p 4000")
 				end
 			end
 		end
 
 		context "if the runtime is not installed" do
 			before :each do
-				@runtime_dir = Dir.mktmpdir
-				@webroot = Dir.mktmpdir
-				@server, @base_url = start_server(@webroot)
-
-				Dir.mkdir("#{@webroot}/#{version}")
-				Dir.chdir("#{@webroot}/#{version}") do
-					create_tarball("webhelper-#{nginx_version}-#{compat_id}.tar.gz") do
-						create_dummy_nginx_binary
-					end
-					create_tarball("support-#{compat_id}.tar.gz") do
-						FileUtils.mkdir_p("agents")
-						FileUtils.mkdir_p("common/libpassenger_common/ApplicationPool2")
-						create_file("common/libboost_oxt.a")
-						create_file("common/libpassenger_common/ApplicationPool2/Implementation.o")
-						create_dummy_support_binaries
-					end
+				@user_dir = File.expand_path("~/#{USER_NAMESPACE_DIRNAME}")
+				if File.exist?("buildout.old")
+					raise "buildout.old exists. Please fix this first."
+				end
+				if File.exist?("#{@user_dir}.old")
+					raise "#{@user_dir} exists. Please fix this first."
+				end
+				if PhusionPassenger.build_system_dir
+					FileUtils.mv("#{PhusionPassenger.build_system_dir}/buildout",
+						"#{PhusionPassenger.build_system_dir}/buildout.old")
+				end
+				if File.exist?(@user_dir)
+					FileUtils.mv(@user_dir, "#{@user_dir}.old")
 				end
-
-				create_file("#{PhusionPassenger.resources_dir}/release.txt")
 			end
 
 			after :each do
-				@server.stop
-				File.unlink("#{PhusionPassenger.resources_dir}/release.txt")
-				FileUtils.remove_entry_secure(@webroot)
-				FileUtils.remove_entry_secure(@runtime_dir)
-			end
-
-			context "when originally packaged" do
-				it "downloads binaries from the Internet" do
-					@output = capture_output("passenger start " +
-						"--runtime-dir '#{@runtime_dir}' " +
-						"--runtime-check-only " +
-						"--binaries-url-root '#{@base_url}'")
-					@output.should include(SUPPORT_BINARIES_DOWNLOAD_MESSAGE)
-					@output.should include(NGINX_BINARY_DOWNLOAD_MESSAGE)
-					@output.should_not include(NGINX_SOURCE_DOWNLOAD_MESSAGE)
-					@output.should_not include(COMPILING_MESSAGE)
+				FileUtils.rm_rf("#{PhusionPassenger.build_system_dir}/buildout")
+				FileUtils.rm_rf(@user_dir)
+				if PhusionPassenger.build_system_dir
+					FileUtils.mv("#{PhusionPassenger.build_system_dir}/buildout.old",
+						"#{PhusionPassenger.build_system_dir}/buildout")
 				end
-
-				it "builds the runtime if downloading fails" do
-					# Yes, we're testing the entire build system here.
-					command = "passenger start " +
-						"--runtime-dir '#{@runtime_dir}' " +
-						"--binaries-url-root '#{@base_url}/wrong'"
-					@output = capture_output("#{command} --runtime-check-only")
-					@output.should include(SUPPORT_BINARIES_DOWNLOAD_MESSAGE)
-					@output.should include(NGINX_BINARY_DOWNLOAD_MESSAGE)
-					@output.should include(NGINX_SOURCE_DOWNLOAD_MESSAGE)
-					@output.should include(COMPILING_MESSAGE)
-
-					test_serving_application(command)
+				if File.exist?("#{@user_dir}.old")
+					FileUtils.mv("#{@user_dir}.old", @user_dir)
 				end
+			end
 
-				specify "if the downloaded support binaries work but the downloaded web helper binary doesn't, " +
-					"and web helper compilation doesn't succeed the first time, then web helper compilation " +
-					"succeeds the second time" do
-					Dir.chdir("#{@webroot}/#{version}") do
-						create_tarball("support-#{compat_id}.tar.gz") do
-							FileUtils.cp_r(Dir["#{PhusionPassenger.source_root}/buildout/*"],
-								".")
-						end
-						create_tarball("webhelper-#{nginx_version}-#{compat_id}.tar.gz") do
-							create_file("PassengerWebHelper",
-								"#!/bin/sh\n" +
-								"exit 1\n")
-						end
-					end
-
-					# Temporarily make Passenger Standalone think our runtime is
-					# not compiled.
-					File.rename("#{PhusionPassenger.source_root}/buildout",
-						"#{PhusionPassenger.source_root}/buildout.renamed")
-					begin
-						command = "passenger start " +
-							"--runtime-dir '#{@runtime_dir}' " +
-							"--binaries-url-root '#{@base_url}'"
-
-						@output = `#{command} --runtime-check-only --no-compile-runtime 2>&1`
-						$?.exitstatus.should_not == 0
-						@output.should include(SUPPORT_BINARIES_DOWNLOAD_MESSAGE)
-						@output.should include("All good\n")
-						@output.should include(NGINX_BINARY_DOWNLOAD_MESSAGE)
-						@output.should include("Not usable, will compile from source")
-						@output.should include("Refusing to compile the Phusion Passenger Standalone runtime")
-
-						@output = capture_output("#{command} --runtime-check-only")
-						@output.should include(NGINX_SOURCE_DOWNLOAD_MESSAGE)
-						@output.should include(COMPILING_MESSAGE)
-						File.exist?("#{PhusionPassenger.source_root}/buildout").should be_false
-
-						test_serving_application("#{command} --no-compile-runtime")
-						File.exist?("#{PhusionPassenger.source_root}/buildout").should be_false
-					ensure
-						FileUtils.rm_rf("#{PhusionPassenger.source_root}/buildout")
-						File.rename("#{PhusionPassenger.source_root}/buildout.renamed",
-							"#{PhusionPassenger.source_root}/buildout")
-					end
+			context "when natively packaged" do
+				it "tries to install the runtime" do
+					command = "passenger start --no-install-runtime --runtime-check-only"
+					`#{command} 2>&1`.should include("Refusing to install")
 				end
 
 				it "starts a server which serves the application" do
-					# The last test already tests this. This empty test here
-					# is merely to show the intent of the tests, and to
-					# speed up the test suite by preventing an unnecessary
-					# compilation.
+					output = capture_output("passenger start --runtime-check-only")
+					output.should include(AGENT_BINARY_DOWNLOAD_MESSAGE)
+					output.should include(NGINX_BINARY_INSTALL_MESSAGE)
+					test_serving_application("passenger start")
 				end
 			end
 
-			context "when natively packaged" do
+			context "when custom packaged" do
 				before :each do
-					sh "passenger-config --make-locations-ini --for-native-packaging-method=deb " +
-						"> '#{@runtime_dir}/locations.ini'"
-					ENV['PASSENGER_LOCATION_CONFIGURATION_FILE'] = "#{@runtime_dir}/locations.ini"
-					create_file("#{PhusionPassenger.lib_dir}/PassengerWebHelper")
+					@tmpdir = Dir.mktmpdir
+					sh "passenger-config --make-locations-ini --for-packaging-method=deb " +
+			 			"> '#{@tmpdir}/locations.ini'"
+			 		ENV['PASSENGER_LOCATION_CONFIGURATION_FILE'] = "#{@tmpdir}/locations.ini"
 				end
 
 				after :each do
 					ENV.delete('PASSENGER_LOCATION_CONFIGURATION_FILE')
-					File.unlink("#{PhusionPassenger.lib_dir}/PassengerWebHelper")
+					FileUtils.remove_entry_secure(@tmpdir)
 				end
 
-				it "downloads only the Nginx binary from the Internet" do
-					File.rename("#{@webroot}/#{version}/webhelper-#{nginx_version}-#{compat_id}.tar.gz",
-						"#{@webroot}/#{version}/webhelper-0.0.1-#{compat_id}.tar.gz")
-					@output = capture_output("passenger start " +
-						"--runtime-dir '#{@runtime_dir}' " +
-						"--runtime-check-only " +
-						"--binaries-url-root '#{@base_url}' " +
-						"--nginx-version 0.0.1")
-					@output.should_not include(SUPPORT_BINARIES_DOWNLOAD_MESSAGE)
-					@output.should include(NGINX_BINARY_DOWNLOAD_MESSAGE)
-					@output.should_not include(NGINX_SOURCE_DOWNLOAD_MESSAGE)
-					@output.should_not include(COMPILING_MESSAGE)
-				end
-
-				it "only builds Nginx if downloading fails" do
-					# Yes, we're testing the build system here.
-					command = "passenger start " +
-						"--runtime-dir '#{@runtime_dir}' " +
-						"--binaries-url-root '#{@base_url}' " +
-						"--nginx-version 1.4.1"
-					@output = capture_output("#{command} --runtime-check-only")
-					@output.should_not include(SUPPORT_BINARIES_DOWNLOAD_MESSAGE)
-					@output.should include(NGINX_BINARY_DOWNLOAD_MESSAGE)
-					@output.should include(NGINX_SOURCE_DOWNLOAD_MESSAGE)
-					@output.should include(COMPILING_MESSAGE)
-
-					test_serving_application(command)
+				it "tries to install the runtime" do
+					command = "passenger start --no-install-runtime --runtime-check-only"
+					`#{command} 2>&1`.should include("Refusing to install")
 				end
 
 				it "starts a server which serves the application" do
-					# The last test already tests this. This empty test here
-					# is merely to show the intent of the tests, and to
-					# speed up the test suite by preventing an unnecessary
-					# compilation.
+					output = capture_output("passenger start --runtime-check-only")
+					output.should include(AGENT_BINARY_DOWNLOAD_MESSAGE)
+					output.should include(NGINX_BINARY_INSTALL_MESSAGE)
+					test_serving_application("passenger start")
 				end
 			end
+
+			# TODO: move these tests to config/install_standalone_runtime_command_spec.rb
+
+			# before :each do
+			# 	@runtime_dir = Dir.mktmpdir
+			# 	@webroot = Dir.mktmpdir
+			# 	@server, @base_url = start_server(@webroot)
+
+			# 	Dir.mkdir("#{@webroot}/#{version}")
+			# 	Dir.chdir("#{@webroot}/#{version}") do
+			# 		create_tarball("webhelper-#{nginx_version}-#{compat_id}.tar.gz") do
+			# 			create_dummy_nginx_binary
+			# 		end
+			# 		create_tarball("support-#{compat_id}.tar.gz") do
+			# 			FileUtils.mkdir_p("support-binaries")
+			# 			FileUtils.mkdir_p("common/libpassenger_common/ApplicationPool2")
+			# 			create_file("common/libboost_oxt.a")
+			# 			create_file("common/libpassenger_common/ApplicationPool2/Implementation.o")
+			# 			create_dummy_support_binaries
+			# 		end
+			# 	end
+
+			# 	create_file("#{PhusionPassenger.resources_dir}/release.txt")
+			# end
+
+			# after :each do
+			# 	@server.stop
+			# 	File.unlink("#{PhusionPassenger.resources_dir}/release.txt")
+			# 	FileUtils.remove_entry_secure(@webroot)
+			# 	FileUtils.remove_entry_secure(@runtime_dir)
+			# end
+
+			# context "when originally packaged" do
+			# 	it "downloads binaries from the Internet" do
+			# 		@output = capture_output("passenger start " +
+			# 			"--runtime-dir '#{@runtime_dir}' " +
+			# 			"--runtime-check-only " +
+			# 			"--binaries-url-root '#{@base_url}'")
+			# 		@output.should include(SUPPORT_BINARIES_DOWNLOAD_MESSAGE)
+			# 		@output.should include(NGINX_BINARY_DOWNLOAD_MESSAGE)
+			# 		@output.should_not include(NGINX_SOURCE_DOWNLOAD_MESSAGE)
+			# 		@output.should_not include(COMPILING_MESSAGE)
+			# 	end
+
+			# 	it "builds the runtime if downloading fails" do
+			# 		# Yes, we're testing the entire build system here.
+			# 		command = "passenger start " +
+			# 			"--runtime-dir '#{@runtime_dir}' " +
+			# 			"--binaries-url-root '#{@base_url}/wrong'"
+			# 		@output = capture_output("#{command} --runtime-check-only")
+			# 		@output.should include(SUPPORT_BINARIES_DOWNLOAD_MESSAGE)
+			# 		@output.should include(NGINX_BINARY_DOWNLOAD_MESSAGE)
+			# 		@output.should include(NGINX_SOURCE_DOWNLOAD_MESSAGE)
+			# 		@output.should include(COMPILING_MESSAGE)
+
+			# 		test_serving_application(command)
+			# 	end
+
+			# 	specify "if the downloaded support binaries work but the downloaded web helper binary doesn't, " +
+			# 		"and web helper compilation doesn't succeed the first time, then web helper compilation " +
+			# 		"succeeds the second time" do
+			# 		Dir.chdir("#{@webroot}/#{version}") do
+			# 			create_tarball("support-#{compat_id}.tar.gz") do
+			# 				FileUtils.cp_r(Dir["#{PhusionPassenger.build_system_dir}/buildout/*"],
+			# 					".")
+			# 			end
+			# 			create_tarball("webhelper-#{nginx_version}-#{compat_id}.tar.gz") do
+			# 				create_file("PassengerWebHelper",
+			# 					"#!/bin/sh\n" +
+			# 					"exit 1\n")
+			# 			end
+			# 		end
+
+			# 		# Temporarily make Passenger Standalone think our runtime is
+			# 		# not compiled.
+			# 		File.rename("#{PhusionPassenger.build_system_dir}/buildout",
+			# 			"#{PhusionPassenger.build_system_dir}/buildout.renamed")
+			# 		begin
+			# 			command = "passenger start " +
+			# 				"--runtime-dir '#{@runtime_dir}' " +
+			# 				"--binaries-url-root '#{@base_url}'"
+
+			# 			@output = `#{command} --runtime-check-only --no-compile-runtime 2>&1`
+			# 			$?.exitstatus.should_not == 0
+			# 			@output.should include(SUPPORT_BINARIES_DOWNLOAD_MESSAGE)
+			# 			@output.should include("All good\n")
+			# 			@output.should include(NGINX_BINARY_DOWNLOAD_MESSAGE)
+			# 			@output.should include("Not usable, will compile from source")
+			# 			@output.should include("Refusing to compile the Phusion Passenger Standalone runtime")
+
+			# 			@output = capture_output("#{command} --runtime-check-only")
+			# 			@output.should include(NGINX_SOURCE_DOWNLOAD_MESSAGE)
+			# 			@output.should include(COMPILING_MESSAGE)
+			# 			File.exist?("#{PhusionPassenger.build_system_dir}/buildout").should be_false
+
+			# 			test_serving_application("#{command} --no-compile-runtime")
+			# 			File.exist?("#{PhusionPassenger.build_system_dir}/buildout").should be_false
+			# 		ensure
+			# 			FileUtils.rm_rf("#{PhusionPassenger.build_system_dir}/buildout")
+			# 			File.rename("#{PhusionPassenger.build_system_dir}/buildout.renamed",
+			# 				"#{PhusionPassenger.build_system_dir}/buildout")
+			# 		end
+			# 	end
+			# end
+
+			# context "when custom packaged" do
+			# 	before :each do
+			# 		sh "passenger-config --make-locations-ini --for-packaging-method=deb " +
+			# 			"> '#{@runtime_dir}/locations.ini'"
+			# 		ENV['PASSENGER_LOCATION_CONFIGURATION_FILE'] = "#{@runtime_dir}/locations.ini"
+			# 		create_file("#{PhusionPassenger.lib_dir}/PassengerWebHelper")
+			# 	end
+
+			# 	after :each do
+			# 		ENV.delete('PASSENGER_LOCATION_CONFIGURATION_FILE')
+			# 		File.unlink("#{PhusionPassenger.lib_dir}/PassengerWebHelper")
+			# 	end
+
+			# 	it "downloads only the Nginx binary from the Internet" do
+			# 		File.rename("#{@webroot}/#{version}/webhelper-#{nginx_version}-#{compat_id}.tar.gz",
+			# 			"#{@webroot}/#{version}/webhelper-0.0.1-#{compat_id}.tar.gz")
+			# 		@output = capture_output("passenger start " +
+			# 			"--runtime-dir '#{@runtime_dir}' " +
+			# 			"--runtime-check-only " +
+			# 			"--binaries-url-root '#{@base_url}' " +
+			# 			"--nginx-version 0.0.1")
+			# 		@output.should_not include(SUPPORT_BINARIES_DOWNLOAD_MESSAGE)
+			# 		@output.should include(NGINX_BINARY_DOWNLOAD_MESSAGE)
+			# 		@output.should_not include(NGINX_SOURCE_DOWNLOAD_MESSAGE)
+			# 		@output.should_not include(COMPILING_MESSAGE)
+			# 	end
+
+			# 	it "only builds Nginx if downloading fails" do
+			# 		# Yes, we're testing the build system here.
+			# 		command = "passenger start " +
+			# 			"--runtime-dir '#{@runtime_dir}' " +
+			# 			"--binaries-url-root '#{@base_url}' " +
+			# 			"--nginx-version 1.4.1"
+			# 		@output = capture_output("#{command} --runtime-check-only")
+			# 		@output.should_not include(SUPPORT_BINARIES_DOWNLOAD_MESSAGE)
+			# 		@output.should include(NGINX_BINARY_DOWNLOAD_MESSAGE)
+			# 		@output.should include(NGINX_SOURCE_DOWNLOAD_MESSAGE)
+			# 		@output.should include(COMPILING_MESSAGE)
+
+			# 		test_serving_application(command)
+			# 	end
+			# end
 		end
 
 		context "if the runtime is installed" do
-			it "doesn't download the runtime from the Internet"
-			it "doesn't build the runtime"
+			before :all do
+				capture_output("passenger-config compile-nginx-engine")
+			end
+
+			it "doesn't download the runtime from the Internet" do
+				command = "passenger start --no-install-runtime --runtime-check-only"
+				capture_output(command).should_not include(AGENT_BINARY_DOWNLOAD_MESSAGE)
+			end
+
+			it "doesn't build the runtime" do
+				command = "passenger start --no-install-runtime --runtime-check-only"
+				capture_output(command).should_not include(AGENT_BINARY_COMPILE_MESSAGE)
+			end
+
+			it "starts a server which serves the application" do
+				test_serving_application("passenger start")
+			end
 		end
 
 		it "daemonizes if -d is given" do