Skip to content

Commit

Permalink
Cleanup spec_helper
Browse files Browse the repository at this point in the history
  • Loading branch information
mblaschke committed Feb 6, 2017
1 parent e10296d commit 1759c7d
Showing 1 changed file with 0 additions and 22 deletions.
22 changes: 0 additions & 22 deletions tests/serverspec/spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,10 @@
Dir[base_spec_dir.join('shared/**/*.rb')].sort.each{ |f| require f }
Dir[base_spec_dir.join('collection/**.rb')].sort.each{ |f| require f }

if not ENV['DOCKERFILE']
raise 'Environment variable "OCKERFILE" not set'
end

if not File.exist?(ENV['DOCKERFILE'])
raise 'Dockerfile \"' + ENV['DOCKERFILE'] + '\" not found'
end

set :backend, :docker
set :docker_container, ENV['DOCKER_IMAGE']
set :os, :family => ENV['OS_FAMILY'], :version => ENV['OS_VERSION'], :arch => 'x86_64'


Excon.defaults[:write_timeout] = 1000
Excon.defaults[:read_timeout] = 1000

Expand Down Expand Up @@ -83,16 +74,3 @@
$testConfiguration[:phpBlackfire] = true
$testConfiguration[:phpXdebug] = false
end

def wait_retry(time, increment = 1, elapsed_time = 0, &block)
begin
yield
rescue Exception => e
if elapsed_time >= time
raise e
else
sleep increment
wait_retry(time, increment, elapsed_time + increment, &block)
end
end
end

0 comments on commit 1759c7d

Please sign in to comment.