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)
|
||||
end
|
||||
|
||||
tests("#get_object('fogobjectests', 'fog_object')").returns(lorem_file.read) do
|
||||
tests("#get_object('fogobjectests', 'fog_object')").succeeds do
|
||||
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
|
||||
|
||||
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?
|
||||
data = ''
|
||||
Fog::Storage[:rackspace].get_object('fogobjecttests', 'fog_object') do |chunk, remaining_bytes, total_bytes|
|
||||
data << chunk
|
||||
end
|
||||
data
|
||||
data == lorem_file.read
|
||||
end
|
||||
|
||||
tests("#head_object('fogobjectests', 'fog_object')").succeeds do
|
||||
|
@ -70,36 +70,30 @@ Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
|
|||
storage = Fog::Storage::Rackspace.new(:rackspace_temp_url_key => "super_secret")
|
||||
storage.extend RackspaceStorageHelpers
|
||||
storage.override_path('/fake_version/fake_tenant')
|
||||
object_url = storage.get_object_https_url('fogobjecttests', 'fog-object', expires_at)
|
||||
object_url = storage.get_object_https_url('fogobjecttests', 'fog-object', expires_at)
|
||||
object_url =~ /https:\/\/.*clouddrive.com\/[^\/]+\/[^\/]+\/fogobjecttests\/fog%2Dobject\?temp_url_sig=a24dd5fc955a57adce7d1b5bc4ec2c7660ab8396&temp_url_expires=1344149532/
|
||||
end
|
||||
|
||||
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
|
||||
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
|
||||
if file.pos < file.size
|
||||
file.sysread(buffer_size)
|
||||
else
|
||||
""
|
||||
end
|
||||
file.read(buffer_size).to_s
|
||||
end
|
||||
ensure
|
||||
file.close
|
||||
end
|
||||
end
|
||||
|
||||
tests("object successfully uploaded?").returns(lorem_file.read) do
|
||||
pending if Fog.mocking?
|
||||
Fog::Storage[:rackspace].get_object('fogobjecttests', 'fog_block_object').body
|
||||
tests('#get_object').succeeds do
|
||||
Fog::Storage[:rackspace].get_object('fogobjecttests', 'fog_block_object').body == lorem_file.read
|
||||
end
|
||||
|
||||
tests("delete file").succeeds do
|
||||
pending if Fog.mocking?
|
||||
tests('#delete_object').succeeds do
|
||||
Fog::Storage[:rackspace].delete_object('fogobjecttests', 'fog_block_object')
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Reference in a new issue