From 869c2ecc5328349e2c10280917b9bd3d780472d5 Mon Sep 17 00:00:00 2001 From: Alexander Stuart-Kregor Date: Sun, 12 Feb 2017 12:25:23 +0000 Subject: [PATCH] Ensure get_bucket_object_versions errors are correctly mocked. --- tests/requests/storage/object_tests.rb | 2 +- tests/requests/storage/versioning_tests.rb | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/requests/storage/object_tests.rb b/tests/requests/storage/object_tests.rb index 9412ef859..e606b2470 100644 --- a/tests/requests/storage/object_tests.rb +++ b/tests/requests/storage/object_tests.rb @@ -1,6 +1,6 @@ # encoding: utf-8 -Shindo.tests('AWS::Storage | object requests', ['aws', 's3object']) do +Shindo.tests('AWS::Storage | object requests', ['aws']) do @directory = Fog::Storage[:aws].directories.create(:key => 'fogobjecttests-' + Time.now.to_i.to_s(32)) @aws_owner = Fog::Storage[:aws].get_bucket_acl(@directory.key).body['Owner'] diff --git a/tests/requests/storage/versioning_tests.rb b/tests/requests/storage/versioning_tests.rb index f6f455d09..2b23e8153 100644 --- a/tests/requests/storage/versioning_tests.rb +++ b/tests/requests/storage/versioning_tests.rb @@ -20,7 +20,7 @@ def delete_bucket Fog::Storage[:aws].delete_bucket(@aws_bucket_name) end -Shindo.tests('Fog::Storage[:aws] | versioning', ["aws"]) do +Shindo.tests('Fog::Storage[:aws] | versioning', ["aws", 'versioning']) do tests('success') do tests("#put_bucket_versioning") do @aws_bucket_name = 'fogbuckettests-' + Fog::Mock.random_hex(16) @@ -229,6 +229,10 @@ Shindo.tests('Fog::Storage[:aws] | versioning', ["aws"]) do Fog::Storage[:aws].put_bucket_versioning(@aws_bucket_name, 'bad_value') end + tests("#get_bucket_object_versions('#{@aws_bucket_name}', { 'version-id-marker' => 'foo' })").raises(Excon::Errors::BadRequest) do + Fog::Storage[:aws].get_bucket_object_versions(@aws_bucket_name, { 'version-id-marker' => 'foo' }) + end + tests("#put_bucket_versioning('fognonbucket', 'Enabled')").raises(Excon::Errors::NotFound) do Fog::Storage[:aws].put_bucket_versioning('fognonbucket', 'Enabled') end