mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
[rackspace|storage] fix tests under ruby-1.8.7
This commit is contained in:
parent
715ea940e2
commit
94cb9c4a17
1 changed files with 12 additions and 18 deletions
|
@ -17,18 +17,18 @@ Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
|
||||||
Fog::Storage[:rackspace].put_object('fogobjecttests', 'fog_object', lorem_file)
|
Fog::Storage[:rackspace].put_object('fogobjecttests', 'fog_object', lorem_file)
|
||||||
end
|
end
|
||||||
|
|
||||||
tests("#get_object('fogobjectests', 'fog_object')").returns(lorem_file.read) do
|
tests("#get_object('fogobjectests', 'fog_object')").succeeds do
|
||||||
pending if Fog.mocking?
|
pending if Fog.mocking?
|
||||||
Fog::Storage[:rackspace].get_object('fogobjecttests', 'fog_object').body
|
Fog::Storage[:rackspace].get_object('fogobjecttests', 'fog_object').body == lorem_file.read
|
||||||
end
|
end
|
||||||
|
|
||||||
tests("#get_object('fogobjecttests', 'fog_object', &block)").returns(lorem_file.read) do
|
tests("#get_object('fogobjecttests', 'fog_object', &block)").succeeds do
|
||||||
pending if Fog.mocking?
|
pending if Fog.mocking?
|
||||||
data = ''
|
data = ''
|
||||||
Fog::Storage[:rackspace].get_object('fogobjecttests', 'fog_object') do |chunk, remaining_bytes, total_bytes|
|
Fog::Storage[:rackspace].get_object('fogobjecttests', 'fog_object') do |chunk, remaining_bytes, total_bytes|
|
||||||
data << chunk
|
data << chunk
|
||||||
end
|
end
|
||||||
data
|
data == lorem_file.read
|
||||||
end
|
end
|
||||||
|
|
||||||
tests("#head_object('fogobjectests', 'fog_object')").succeeds do
|
tests("#head_object('fogobjectests', 'fog_object')").succeeds do
|
||||||
|
@ -75,31 +75,25 @@ Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
|
||||||
end
|
end
|
||||||
|
|
||||||
tests("put_object with block") do
|
tests("put_object with block") do
|
||||||
tests("#put_object('fogobjecttests', 'fog_object', &block)") do
|
pending if Fog.mocking?
|
||||||
pending if Fog.mocking?
|
|
||||||
|
|
||||||
|
tests("#put_object('fogobjecttests', 'fog_object', &block)").succeeds do
|
||||||
begin
|
begin
|
||||||
file = lorem_file
|
file = lorem_file
|
||||||
buffer_size = file.size / 2 # chop it up into two buffers
|
buffer_size = file.stat.size / 2 # chop it up into two buffers
|
||||||
Fog::Storage[:rackspace].put_object('fogobjecttests', 'fog_block_object', nil) do
|
Fog::Storage[:rackspace].put_object('fogobjecttests', 'fog_block_object', nil) do
|
||||||
if file.pos < file.size
|
file.read(buffer_size).to_s
|
||||||
file.sysread(buffer_size)
|
|
||||||
else
|
|
||||||
""
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
ensure
|
ensure
|
||||||
file.close
|
file.close
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
tests("object successfully uploaded?").returns(lorem_file.read) do
|
tests('#get_object').succeeds do
|
||||||
pending if Fog.mocking?
|
Fog::Storage[:rackspace].get_object('fogobjecttests', 'fog_block_object').body == lorem_file.read
|
||||||
Fog::Storage[:rackspace].get_object('fogobjecttests', 'fog_block_object').body
|
|
||||||
end
|
end
|
||||||
|
|
||||||
tests("delete file").succeeds do
|
tests('#delete_object').succeeds do
|
||||||
pending if Fog.mocking?
|
|
||||||
Fog::Storage[:rackspace].delete_object('fogobjecttests', 'fog_block_object')
|
Fog::Storage[:rackspace].delete_object('fogobjecttests', 'fog_block_object')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Reference in a new issue