[PATCH core 3/6] Mock: Respond 404 when deleting non-existing bucket

[mf...@redhat.com]

From: Michal Fojtik <mf...@redhat.com>


Signed-off-by: Michal fojtik <mf...@redhat.com>
---
 server/lib/deltacloud/drivers/mock/mock_driver.rb |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/server/lib/deltacloud/drivers/mock/mock_driver.rb b/server/lib/deltacloud/drivers/mock/mock_driver.rb
index 67b4990..d8882db 100644
--- a/server/lib/deltacloud/drivers/mock/mock_driver.rb
+++ b/server/lib/deltacloud/drivers/mock/mock_driver.rb
@@ -365,7 +365,8 @@ module Deltacloud::Drivers::Mock
     def delete_bucket(credentials, name, opts={})
       check_credentials(credentials)
       bucket = bucket(credentials, {:id => name})
-      raise "BucketNotEmpty" unless (bucket.size == "0")
+      raise 'BucketNotExist' if bucket.nil?
+      raise "BucketNotEmpty" unless (bucket and bucket.size == "0")
       @client.destroy(:buckets, bucket.id)
     end
 
@@ -385,7 +386,7 @@ module Deltacloud::Drivers::Mock
     def blob_data(credentials, bucket_id, blob_id, opts = {})
       check_credentials(credentials)
       if blob = @client.load(:blobs, blob_id)
-        blob[:content].each {|part| yield part}
+        blob[:content].split('').each {|part| yield part}
       end
     end
 
@@ -507,6 +508,10 @@ module Deltacloud::Drivers::Mock
         message "Key with same name already exists"
       end
 
+      on /BucketNotExist/ do
+        status 404
+      end
+
       on /CreateImageNotSupported/ do
         status 500
       end
-- 
1.7.9.1