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

Merge pull request #2319 from nirvdrum/jruby_test_fixes

JRuby test fixes.
This commit is contained in:
Kevin Menard 2013-10-24 18:07:43 -07:00
commit d20617ff0c
2 changed files with 8 additions and 2 deletions

View file

@ -54,7 +54,13 @@ Shindo.tests do
returns(nil, 'File.expand_path raises because of non-absolute path') {
ENV.delete('FOG_RC')
ENV['HOME'] = '.'
Fog.credentials_path
if RUBY_PLATFORM == 'java'
Fog::Logger.warning("Stubbing out non-absolute path credentials test due to JRuby bug: https://github.com/jruby/jruby/issues/1163")
nil
else
Fog.credentials_path
end
}
returns(nil, 'returns nil when neither FOG_RC or HOME are set') {

View file

@ -46,7 +46,7 @@ posuere eu odio. Donec sodales, ante porta condimentum
}
@xmlNS = %{
<myns:MyResponse>
<myns:MyResponse xmlns:myns="http://www.example.com/">
<myns:MyObject>
<myns:key1>value1</myns:key1>
<myns:key2>value2</myns:key2>