1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00

Do not skip tests when configuration is missing

This commit is contained in:
Paul Thornthwaite 2014-12-10 22:24:22 +00:00
parent 0ef2453fa0
commit bef66010ab
2 changed files with 12 additions and 1 deletions

View file

@ -107,6 +107,12 @@ def compute_providers
:name => "fog_#{Time.now.to_i}"
},
:mocked => true
},
:serverlove => {
:mocked => false
},
:xenserver => {
:mocked => false
}
}
end

View file

@ -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