passenger 4.0.60 → 5.0.0.beta1

data/test/cxx/UtilsTest.cpp

@@ -23,12 +23,12 @@ namespace tut {
 			char buffer[PATH_MAX];
 			cwd = getcwd(buffer, sizeof(buffer));
 			oldPath = getenv("PATH");
-			unsetenv("PASSENGER_TEMP_DIR");
+			unsetenv("TMPDIR");
 		}
 
 		~UtilsTest() {
 			setenv("PATH", oldPath.c_str(), 1);
-			unsetenv("PASSENGER_TEMP_DIR");
+			unsetenv("TMPDIR");
 			chdir(cwd.c_str());
 		}
 
@@ -136,47 +136,23 @@ namespace tut {
 	/***** Test getSystemTempDir() *****/
 
 	TEST_METHOD(11) {
-		// It returns "/tmp" if the PASSENGER_TEMP_DIR environment is NULL.
+		// It returns "/tmp" if the TMPDIR environment is NULL.
 		ensure_equals(string(getSystemTempDir()), "/tmp");
 	}
 
 	TEST_METHOD(12) {
-		// It returns "/tmp" if the PASSENGER_TEMP_DIR environment is an empty string.
-		setenv("PASSENGER_TEMP_DIR", "", 1);
+		// It returns "/tmp" if the TMPDIR environment is an empty string.
+		setenv("TMPDIR", "", 1);
 		ensure_equals(string(getSystemTempDir()), "/tmp");
 	}
 
 	TEST_METHOD(13) {
-		// It returns the value of the PASSENGER_TEMP_DIR environment if it is not NULL and not empty.
-		setenv("PASSENGER_TEMP_DIR", "/foo", 1);
+		// It returns the value of the TMPDIR environment if it is not NULL and not empty.
+		setenv("TMPDIR", "/foo", 1);
 		ensure_equals(string(getSystemTempDir()), "/foo");
 	}
 
 
-	/***** Test BufferedUpload *****/
-
-	TEST_METHOD(20) {
-		// The resulting file handle is readable and writable.
-		TempDir td("utils_test.tmp");
-		BufferedUpload t("utils_test.tmp");
-		char line[30];
-
-		fprintf(t.handle, "hello world!");
-		fflush(t.handle);
-		fseek(t.handle, 0, SEEK_SET);
-		memset(line, 0, sizeof(line));
-		fgets(line, sizeof(line), t.handle);
-		ensure_equals(string(line), "hello world!");
-	}
-
-	TEST_METHOD(21) {
-		// It immediately unlinks the temp file.
-		DONT_RUN_IN_VAGRANT();
-		TempDir td("utils_test.tmp");
-		BufferedUpload t("utils_test.tmp");
-		ensure_equals(listDir("utils_test.tmp").size(), 0u);
-	}
-
 	/***** Test escapeForXml() *****/
 
 	TEST_METHOD(25) {
@@ -577,8 +553,8 @@ namespace tut {
 		ensure_equals(cEscapeString("foo\n"), "foo\\n");
 		ensure_equals(cEscapeString("foo\r\nbar\e"), "foo\\r\\nbar\\e");
 		ensure_equals(cEscapeString(StaticString("\0\x1\x2\x3\x4\x5\x6\x7\x8\x9", 10)),
-			"\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t");
-		ensure_equals(cEscapeString("\xFF\xFE\t\xD0"), "\\xFF\\xFE\\t\\xD0");
+			"\\000\\001\\002\\003\\004\\005\\006\\007\\010\\t");
+		ensure_equals(cEscapeString("\xFF\xFE\t\xD0"), "\\377\\376\\t\\320");
 	}
 
 	/***** Test escapeHTML() *****/

data/test/integration_tests/apache2_tests.rb

@@ -1,10 +1,14 @@
 require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
 require 'socket'
 require 'fileutils'
+require 'net/http'
+require 'rexml/document'
 require 'support/apache2_controller'
 PhusionPassenger.require_passenger_lib 'platform_info'
 PhusionPassenger.require_passenger_lib 'admin_tools'
-PhusionPassenger.require_passenger_lib 'admin_tools/server_instance'
+PhusionPassenger.require_passenger_lib 'admin_tools/instance_registry'
+
+WEB_SERVER_DECHUNKS_REQUESTS = false
 
 require 'integration_tests/shared/example_webapp_tests'
 
@@ -17,7 +21,7 @@ describe "Apache 2 module" do
 		@passenger_temp_dir = "/tmp/passenger-test.#{$$}"
 		Dir.mkdir(@passenger_temp_dir)
 		FileUtils.chmod_R(0777, @passenger_temp_dir)
-		ENV['PASSENGER_TEMP_DIR'] = @passenger_temp_dir
+		ENV['TMPDIR'] = @passenger_temp_dir
 	end
 
 	after :all do
@@ -31,6 +35,20 @@ describe "Apache 2 module" do
 			# Make sure that all Apache 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
 
@@ -45,12 +63,18 @@ describe "Apache 2 module" 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_apache2_controller
 			@server = "http://1.passenger.test:#{@apache2.port}"
 			@stub = RackStub.new('rack')
-			@apache2 << "RailsMaxPoolSize 1"
+			@apache2 << "PassengerMaxPoolSize 1"
 			@apache2.set_vhost("1.passenger.test", "#{@stub.full_app_root}/public")
 			@apache2.start
 		end
@@ -72,7 +96,7 @@ describe "Apache 2 module" do
 			create_apache2_controller
 			@server = "http://1.passenger.test:#{@apache2.port}/subapp"
 			@stub = RackStub.new('rack')
-			@apache2 << "RailsMaxPoolSize 1"
+			@apache2 << "PassengerMaxPoolSize 1"
 			@apache2.set_vhost("1.passenger.test", File.expand_path("stub")) do |vhost|
 				vhost << %Q{
 					Alias /subapp #{@stub.full_app_root}/public
@@ -107,7 +131,7 @@ describe "Apache 2 module" do
 			create_apache2_controller
 			@server = "http://1.passenger.test:#{@apache2.port}"
 			@stub = PythonStub.new('wsgi')
-			@apache2 << "RailsMaxPoolSize 1"
+			@apache2 << "PassengerMaxPoolSize 1"
 			@apache2.set_vhost("1.passenger.test", "#{@stub.full_app_root}/public")
 			@apache2.start
 		end
@@ -129,7 +153,7 @@ describe "Apache 2 module" do
 			create_apache2_controller
 			@server = "http://1.passenger.test:#{@apache2.port}/subapp"
 			@stub = PythonStub.new('wsgi')
-			@apache2 << "RailsMaxPoolSize 1"
+			@apache2 << "PassengerMaxPoolSize 1"
 			@apache2.set_vhost("1.passenger.test", File.expand_path("stub")) do |vhost|
 				vhost << %Q{
 					Alias /subapp #{@stub.full_app_root}/public
@@ -164,7 +188,7 @@ describe "Apache 2 module" do
 			create_apache2_controller
 			@server = "http://1.passenger.test:#{@apache2.port}"
 			@stub = NodejsStub.new('node')
-			@apache2 << "RailsMaxPoolSize 1"
+			@apache2 << "PassengerMaxPoolSize 1"
 			@apache2.set_vhost("1.passenger.test", "#{@stub.full_app_root}/public")
 			@apache2.start
 		end
@@ -186,7 +210,7 @@ describe "Apache 2 module" do
 			create_apache2_controller
 			@server = "http://1.passenger.test:#{@apache2.port}/subapp"
 			@stub = NodejsStub.new('node')
-			@apache2 << "RailsMaxPoolSize 1"
+			@apache2 << "PassengerMaxPoolSize 1"
 			@apache2.set_vhost("1.passenger.test", File.expand_path("stub")) do |vhost|
 				vhost << %Q{
 					Alias /subapp #{@stub.full_app_root}/public
@@ -219,11 +243,11 @@ describe "Apache 2 module" do
 	describe "compatibility with other modules" do
 		before :all do
 			create_apache2_controller
-			@apache2 << "RailsMaxPoolSize 1"
+			@apache2 << "PassengerMaxPoolSize 1"
+			@apache2 << "PassengerStatThrottleRate 0"
 
 			@stub = RackStub.new('rack')
 			@server = "http://1.passenger.test:#{@apache2.port}"
-			@apache2 << "RailsMaxPoolSize 1"
 			@apache2.set_vhost("1.passenger.test", "#{@stub.full_app_root}/public") do |vhost|
 				vhost << "RewriteEngine on"
 				vhost << "RewriteRule ^/rewritten_frontpage$ / [PT,QSA,L]"
@@ -244,7 +268,7 @@ describe "Apache 2 module" do
 		it "supports environment variable passing through mod_env" do
 			File.write("#{@stub.app_root}/public/.htaccess", 'SetEnv FOO "Foo Bar!"')
 			File.touch("#{@stub.app_root}/tmp/restart.txt", 2)  # Activate ENV changes.
-			get('/env').should =~ /^FOO = Foo Bar\!$/
+			get('/system_env').should =~ /^FOO = Foo Bar\!$/
 		end
 
 		it "supports mod_rewrite in the virtual host block" do
@@ -271,6 +295,7 @@ describe "Apache 2 module" do
 		before :all do
 			create_apache2_controller
 			@apache2 << "PassengerMaxPoolSize 3"
+			@apache2 << "PassengerStatThrottleRate 0"
 
 			@stub = RackStub.new('rack')
 			@stub_url_root = "http://5.passenger.test:#{@apache2.port}"
@@ -283,7 +308,7 @@ describe "Apache 2 module" do
 			@stub2 = RackStub.new('rack')
 			@stub2_url_root = "http://6.passenger.test:#{@apache2.port}"
 			@apache2.set_vhost('6.passenger.test', "#{@stub2.full_app_root}/public") do |vhost|
-				vhost << "RailsEnv development"
+				vhost << "PassengerAppEnv development"
 				vhost << "PassengerSpawnMethod conservative"
 				vhost << "PassengerRestartDir #{@stub2.full_app_root}/public"
 				vhost << "AllowEncodedSlashes off"
@@ -303,12 +328,12 @@ describe "Apache 2 module" do
 			@stub2.reset
 		end
 
-		specify "RailsEnv is per-virtual host" do
+		specify "PassengerAppEnv is per-virtual host" do
 			@server = @stub_url_root
-			get('/system_env').should =~ /RAILS_ENV = production/
+			get('/system_env').should =~ /PASSENGER_APP_ENV = production/
 
 			@server = @stub2_url_root
-			get('/system_env').should =~ /RAILS_ENV = development/
+			get('/system_env').should =~ /PASSENGER_APP_ENV = development/
 		end
 
 		it "looks for restart.txt in the directory specified by PassengerRestartDir" do
@@ -436,13 +461,14 @@ describe "Apache 2 module" do
 			FileUtils.mkdir_p('tmp.webdir')
 			@webdir = File.expand_path('tmp.webdir')
 			@apache2.set_vhost('1.passenger.test', @webdir) do |vhost|
-				vhost << "RailsBaseURI /app-that-crashes-during-startup/public"
+				vhost << "PassengerBaseURI /app-that-crashes-during-startup/public"
 			end
 
 			@stub = RackStub.new('rack')
 			@stub_url_root = "http://2.passenger.test:#{@apache2.port}"
 			@apache2.set_vhost('2.passenger.test', "#{@stub.full_app_root}/public")
 
+			@apache2 << "PassengerFriendlyErrorPages on"
 			@apache2.start
 		end
 
@@ -485,6 +511,7 @@ describe "Apache 2 module" do
 			create_apache2_controller
 			@stub = RackStub.new('rack')
 			@stub_url_root = "http://1.passenger.test:#{@apache2.port}"
+			@apache2 << "PassengerStatThrottleRate 0"
 			@apache2.set_vhost('1.passenger.test', "#{@stub.full_app_root}/public")
 			@apache2.start
 			@server = "http://1.passenger.test:#{@apache2.port}"
@@ -501,19 +528,19 @@ describe "Apache 2 module" do
 
 		it "is restarted if it crashes" do
 			# Make sure that all Apache worker processes have connected to
-			# the helper server.
+			# the helper agent.
 			10.times do
 				get('/').should == "front page"
 				sleep 0.1
 			end
 
-			# Now kill the helper server.
-			instance = AdminTools::ServerInstance.list.first
-			Process.kill('SIGKILL', instance.helper_agent_pid)
+			# Now kill the helper agent.
+			instance = AdminTools::InstanceRegistry.new.list.first
+			Process.kill('SIGKILL', instance.server_pid)
 			sleep 0.02 # Give the signal a small amount of time to take effect.
 
 			# Each worker process should detect that the old
-			# helper server has died, and should reconnect.
+			# helper agent has died, and should reconnect.
 			10.times do
 				get('/').should == "front page"
 				sleep 0.1
@@ -523,17 +550,28 @@ describe "Apache 2 module" do
 		it "exposes the application pool for passenger-status" do
 			File.touch("#{@stub.app_root}/tmp/restart.txt", 1)  # Get rid of all previous app processes.
 			get('/').should == "front page"
-			instance = AdminTools::ServerInstance.list.first
+			instance = AdminTools::InstanceRegistry.new.list.first
 
 			# Wait until the server has processed the session close event.
 			sleep 0.1
 
-			processes = instance.connect(:role => :passenger_status) do |client|
-				instance.processes(client)
+			request = Net::HTTP::Get.new("/pool.xml")
+			request.basic_auth("ro_admin", instance.read_only_admin_password)
+			response = instance.http_request("agents.s/server_admin", request)
+			if response.code.to_i / 100 == 2
+				doc = REXML::Document.new(response.body)
+			else
+				raise response.body
+			end
+
+			groups = doc.get_elements("info/supergroups/supergroup/group")
+			groups.should have(1).item
+			groups.each do |group|
+				group.elements["name"].text.should == "#{@stub.full_app_root} (production)#default"
+				processes = group.get_elements("processes/process")
+				processes.should have(1).item
+				processes[0].elements["processed"].text.should == "1"
 			end
-			processes.should have(1).item
-			processes[0].group.name.should == @stub.full_app_root + "#default"
-			processes[0].processed.should == 1
 		end
 	end
 

data/test/integration_tests/downloaded_binaries_tests.rb

@@ -29,6 +29,7 @@ source_root = File.expand_path("../..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
 require 'phusion_passenger'
 PhusionPassenger.locate_directories
+PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
 PhusionPassenger.require_passenger_lib 'platform_info/binary_compatibility'
 require 'tmpdir'
@@ -47,11 +48,34 @@ describe "Downloaded Phusion Passenger binaries" do
 	before :each do
 		@temp_dir = Dir.mktmpdir
 		File.open("#{PhusionPassenger.resources_dir}/release.txt", "w").close
+		@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 && File.exist?("#{PhusionPassenger.build_system_dir}/buildout")
+			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
 	end
 
 	after :each do
 		FileUtils.remove_entry_secure(@temp_dir)
 		File.unlink("#{PhusionPassenger.resources_dir}/release.txt")
+		FileUtils.rm_rf("#{PhusionPassenger.build_system_dir}/buildout")
+		FileUtils.rm_rf(@user_dir)
+		if PhusionPassenger.build_system_dir && File.exist?("#{PhusionPassenger.build_system_dir}/buildout.old")
+			FileUtils.mv("#{PhusionPassenger.build_system_dir}/buildout.old",
+				"#{PhusionPassenger.build_system_dir}/buildout")
+		end
+		if File.exist?("#{@user_dir}.old")
+			FileUtils.mv("#{@user_dir}.old", @user_dir)
+		end
 	end
 
 	let(:version) { VERSION_STRING }
@@ -80,9 +104,9 @@ describe "Downloaded Phusion Passenger binaries" do
 	specify "Passenger Standalone is able to use the binaries" do
 		Dir.mkdir("#{@temp_dir}/#{version}")
 		Dir.chdir("#{@temp_dir}/#{version}") do
-			tarballs = Dir["#{PhusionPassenger.download_cache_dir}/*.tar.gz"]
-			tarballs.should_not be_empty
-			
+			#tarballs = Dir["#{PhusionPassenger.download_cache_dir}/*.tar.gz"]
+			#tarballs.should_not be_empty
+
 			File.open("config.ru", "w") do |f|
 				f.write(%Q{
 					app = lambda do |env|
@@ -101,7 +125,7 @@ describe "Downloaded Phusion Passenger binaries" do
 					"-d " +
 					"--no-compile-runtime " +
 					"--binaries-url-root http://127.0.0.1:4001 " +
-					"--runtime-dir '#{@temp_dir}' >log/start.log")
+					">log/start.log 2>&1")
 			rescue Exception
 				system("cat log/start.log")
 				raise
@@ -125,7 +149,7 @@ describe "Downloaded Phusion Passenger binaries" do
 		File.rename("download_cache", "download_cache.old")
 		begin
 			FileUtils.cp_r("download_cache.old", "server_root/#{VERSION_STRING}")
-			sh "cd #{PhusionPassenger.source_root} && " +
+			sh "cd #{PhusionPassenger.build_system_dir} && " +
 				"env BINARIES_URL_ROOT=#{url_root} " +
 				"ruby helper-scripts/download_binaries/extconf.rb --abort-on-error"
 			Dir["download_cache/*"].should_not be_empty
@@ -143,7 +167,7 @@ describe "Downloaded Phusion Passenger binaries" do
 		server, url_root = start_server("server_root")
 		File.rename("download_cache", "download_cache.old")
 		begin
-			result = system "cd #{PhusionPassenger.source_root} && " +
+			result = system "cd #{PhusionPassenger.build_system_dir} && " +
 				"env BINARIES_URL_ROOT=#{url_root} " +
 				"ruby helper-scripts/download_binaries/extconf.rb --abort-on-error"
 			result.should be_false

data/test/integration_tests/native_packaging_spec.rb

@@ -25,15 +25,26 @@
 LOCATIONS_INI = ENV['LOCATIONS_INI']
 abort "Please set the LOCATIONS_INI environment variable to the right locations.ini" if !LOCATIONS_INI
 
-NATIVE_PACKAGING_METHOD = ENV['NATIVE_PACKAGING_METHOD']
-if !["deb", "rpm", "homebrew"].include?(NATIVE_PACKAGING_METHOD)
-	abort "Please set NATIVE_PACKAGING_METHOD to either 'deb', 'rpm' or 'homebrew'"
+PACKAGING_METHOD = ENV['NATIVE_PACKAGING_METHOD'] || ENV['PACKAGING_METHOD']
+if !["deb", "rpm", "homebrew"].include?(PACKAGING_METHOD)
+	abort "Please set PACKAGING_METHOD to either 'deb', 'rpm' or 'homebrew'"
+end
+
+# Clean Bundler environment variables. We don't want to start Passenger Standalone
+# with Bundler.
+if defined?(Bundler)
+	clean_env = nil
+	Bundler.with_clean_env do
+		clean_env = ENV.to_hash
+	end
+	ENV.replace(clean_env)
 end
 
 source_root = File.expand_path("../..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
 require 'phusion_passenger'
 PhusionPassenger.locate_directories
+PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'config/validate_install_command'
 require 'tmpdir'
 require 'fileutils'
@@ -49,7 +60,7 @@ ENV['STDERR_TO_STDOUT'] = '1'
 
 module PhusionPassenger
 
-case NATIVE_PACKAGING_METHOD
+case PACKAGING_METHOD
 when "deb"
 	BINDIR = "/usr/bin"
 	SBINDIR = "/usr/sbin"
@@ -58,7 +69,7 @@ when "deb"
 	DOCDIR = "/usr/share/doc/passenger"
 	HELPER_SCRIPTS_DIR = "/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts"
 	RUBY_EXTENSION_SOURCE_DIR = "/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source"
-	AGENTS_DIR = "/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}/agents"
+	SUPPORT_BINARIES_DIR = "/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}/support-binaries"
 	APACHE2_MODULE_PATH = "/usr/lib/apache2/modules/mod_passenger.so"
 	SUPPORTS_COMPILING_APACHE_MODULE = false
 
@@ -79,7 +90,7 @@ when "rpm"
 	DOCDIR = "/usr/share/doc/passenger"
 	HELPER_SCRIPTS_DIR = "/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts"
 	RUBY_EXTENSION_SOURCE_DIR = "/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source"
-	AGENTS_DIR = "/usr/lib64/#{GLOBAL_NAMESPACE_DIRNAME}/agents"
+	SUPPORT_BINARIES_DIR = "/usr/lib64/#{GLOBAL_NAMESPACE_DIRNAME}/support-binaries"
 	APACHE2_MODULE_PATH = "/usr/lib64/httpd/modules/mod_passenger.so"
 	SUPPORTS_COMPILING_APACHE_MODULE = false
 
@@ -100,7 +111,7 @@ when "homebrew"
 	DOCDIR = "#{root}/doc"
 	HELPER_SCRIPTS_DIR = "#{root}/helper-scripts"
 	RUBY_EXTENSION_SOURCE_DIR = "#{root}/ext/ruby"
-	AGENTS_DIR = "#{root}/buildout/agents"
+	SUPPORT_BINARIES_DIR = "#{root}/buildout/support-binaries"
 	APACHE2_MODULE_PATH = "#{root}/buildout/apache2/mod_passenger.so"
 	SUPPORTS_COMPILING_APACHE_MODULE = true
 
@@ -121,7 +132,11 @@ describe "A natively packaged Phusion Passenger" do
 			File.open(filename, "w") do |f|
 				f.write(output)
 			end
-			abort "Command #{command} exited with status #{$?.exitstatus}. Output written to #{filename}"
+			STDERR.puts "Command #{command} exited with status #{$?.exitstatus}. Output written to #{filename}"
+			if ENV['PRINT_FAILED_COMMAND_OUTPUT']
+				STDERR.puts output
+			end
+			abort
 		end
 	end
 
@@ -167,8 +182,8 @@ describe "A natively packaged Phusion Passenger" do
 		end
 	end
 
-	specify "locations.ini sets native_packaging_method to #{NATIVE_PACKAGING_METHOD}" do
-		File.read(LOCATIONS_INI).should =~ /^native_packaging_method=#{NATIVE_PACKAGING_METHOD}$/
+	specify "locations.ini sets packaging_method to #{PACKAGING_METHOD}" do
+		File.read(LOCATIONS_INI).should =~ /^packaging_method=#{PACKAGING_METHOD}$/
 	end
 
 	specify "passenger-status is in #{SBINDIR}" do
@@ -200,10 +215,10 @@ describe "A natively packaged Phusion Passenger" do
 		File.file?("#{RUBY_EXTENSION_SOURCE_DIR}/extconf.rb").should be_true
 	end
 
-	specify "the agents directory exists" do
-		File.directory?(AGENTS_DIR).should be_true
-		File.file?("#{AGENTS_DIR}/PassengerWatchdog").should be_true
-		File.executable?("#{AGENTS_DIR}/PassengerWatchdog").should be_true
+	specify "the support-binaries directory exists" do
+		File.directory?(SUPPORT_BINARIES_DIR).should be_true
+		File.file?("#{SUPPORT_BINARIES_DIR}/#{AGENT_EXE}").should be_true
+		File.executable?("#{SUPPORT_BINARIES_DIR}/#{AGENT_EXE}").should be_true
 	end
 
 	specify "the Apache 2 module exists" do
@@ -223,8 +238,8 @@ describe "A natively packaged Phusion Passenger" do
 			system("passenger-config --compiled").should be_true
 		end
 
-		it "recognizes the install as natively packaged" do
-			system("passenger-config --natively-packaged").should be_true
+		it "recognizes the install as custom packaged" do
+			system("passenger-config --custom-packaged").should be_true
 		end
 
 		it "recognizes the install as coming from an official package" do
@@ -336,7 +351,7 @@ describe "A natively packaged Phusion Passenger" do
 					end
 					Dir.mkdir("public")
 					Dir.mkdir("tmp")
-					sh("passenger start --no-compile-runtime -p 4000 -d >/dev/null")
+					sh("passenger start --no-install-runtime -p 4000 -d >/dev/null")
 					begin
 						open("http://127.0.0.1:4000/") do |f|
 							f.read.should == "ok"