From bef66010ab1032b7034fe0fd2a9be27f872d1532 Mon Sep 17 00:00:00 2001 From: Paul Thornthwaite Date: Wed, 10 Dec 2014 22:24:22 +0000 Subject: [PATCH] Do not skip tests when configuration is missing --- tests/compute/helper.rb | 6 ++++++ tests/helper.rb | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/tests/compute/helper.rb b/tests/compute/helper.rb index d97ef7d34..5fe636b57 100644 --- a/tests/compute/helper.rb +++ b/tests/compute/helper.rb @@ -107,6 +107,12 @@ def compute_providers :name => "fog_#{Time.now.to_i}" }, :mocked => true + }, + :serverlove => { + :mocked => false + }, + :xenserver => { + :mocked => false } } end diff --git a/tests/helper.rb b/tests/helper.rb index 370192a19..5e4063903 100644 --- a/tests/helper.rb +++ b/tests/helper.rb @@ -13,6 +13,12 @@ if Fog.mocking? FOG_TESTING_TIMEOUT = ENV['FOG_TEST_TIMEOUT'] || 2000 Fog.timeout = 2000 Fog::Logger.warning "Setting default fog timeout to #{Fog.timeout} seconds" + + # These sets of tests do not behave nicely when running mocked tests + Thread.current[:tags] << '-serverlove' + Thread.current[:tags] << '-xenserver' + Thread.current[:tags] << '-joyent' + Thread.current[:tags] << '-dreamhost' else FOG_TESTING_TIMEOUT = Fog.timeout end @@ -43,7 +49,6 @@ end for provider in unavailable_providers Fog::Formatador.display_line("[yellow]Skipping tests for [bold]#{provider}[/] [yellow]due to lacking credentials (add some to '#{Fog.credentials_path}' to run them)[/]") - Thread.current[:tags] << ('-' << provider) end # mark libvirt tests pending if not setup