Permalink
Browse files

Fix more download_binaries_tests on OS X.

[ci:skip]
  • Loading branch information...
1 parent ae972b2 commit 3ab0759e936cac1c26ddd03fb04805620288d0b3 @FooBarWidget FooBarWidget committed Jan 15, 2014
Showing with 9 additions and 4 deletions.
  1. +9 −4 test/integration_tests/downloaded_binaries_tests.rb
@@ -30,6 +30,7 @@
require 'phusion_passenger'
PhusionPassenger.locate_directories
PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
+PhusionPassenger.require_passenger_lib 'platform_info/binary_compatibility'
require 'tmpdir'
require 'fileutils'
require 'webrick'
@@ -40,6 +41,8 @@
# so ensure that it's not set.
ENV.delete('PASSENGER_DEBUG')
+module PhusionPassenger
+
describe "Downloaded Phusion Passenger binaries" do
before :each do
@temp_dir = Dir.mktmpdir
@@ -51,9 +54,9 @@
File.unlink("#{PhusionPassenger.resources_dir}/release.txt")
end
- let(:version) { PhusionPassenger::VERSION_STRING }
- let(:nginx_version) { PhusionPassenger::PREFERRED_NGINX_VERSION }
- let(:compat_id) { PhusionPassenger::PlatformInfo.cxx_binary_compatibility_id }
+ let(:version) { VERSION_STRING }
+ let(:nginx_version) { PREFERRED_NGINX_VERSION }
+ let(:compat_id) { PlatformInfo.cxx_binary_compatibility_id }
def sh(*command)
if !system(*command)
@@ -121,7 +124,7 @@ def start_server(document_root)
server, url_root = start_server("server_root")
File.rename("download_cache", "download_cache.old")
begin
- FileUtils.cp_r("download_cache.old", "server_root/#{PhusionPassenger::VERSION_STRING}")
+ FileUtils.cp_r("download_cache.old", "server_root/#{VERSION_STRING}")
sh "cd #{PhusionPassenger.source_root} && " +
"env BINARIES_URL_ROOT=#{url_root} " +
"ruby helper-scripts/download_binaries/extconf.rb --abort-on-error"
@@ -153,3 +156,5 @@ def start_server(document_root)
end
end
end
+
+end # module PhusionPassenger

0 comments on commit 3ab0759

Please sign in to comment.