From 39abf370a471fa33e164e5d9f85703a4641ac6b4 Mon Sep 17 00:00:00 2001 From: Josh Lane Date: Fri, 8 May 2015 14:11:58 -0700 Subject: [PATCH] fix inverted test timeout logic --- tests/helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/helper.rb b/tests/helper.rb index 74ffb6bed..22faa9f06 100644 --- a/tests/helper.rb +++ b/tests/helper.rb @@ -14,8 +14,8 @@ Excon.defaults.merge!(:debug_request => true, :debug_response => true) require File.expand_path(File.join(File.dirname(__FILE__), 'helpers', 'mock_helper')) # This overrides the default 600 seconds timeout during live test runs -if Fog.mocking? - Fog.timeout = ENV['FOG_TEST_TIMEOUT'] || 2000 +unless Fog.mocking? + Fog.timeout = ENV['FOG_TEST_TIMEOUT'] || 2_000 Fog::Logger.warning "Setting default fog timeout to #{Fog.timeout} seconds" end