Merge pull request #579 from cloudfoundry/dav-client-inconsistent

Should not fail if target to be deleted is already gone
cloudfoundry · Apr 19, 2016 · d6f8c50 · d6f8c50
2 parents 214b78e + d61f59b
commit d6f8c50
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/cloud_controller/blobstore/webdav/dav_client.rb b/lib/cloud_controller/blobstore/webdav/dav_client.rb
@@ -158,7 +158,9 @@ def delete_all_in_path(path)
         response = with_error_handling { @client.delete(url, header: @headers) }
         return if response.status == 204
 
-        raise FileNotFound.new("Could not find object '#{URI(url).path}', #{response.status}/#{response.content}") if response.status == 404
+        # requesting to delete something which is already gone is ok
+        return if response.status == 404
+
         raise BlobstoreError.new("Could not delete all in path, #{response.status}/#{response.content}")
       end
 

diff --git a/spec/unit/lib/cloud_controller/blobstore/webdav/dav_client_spec.rb b/spec/unit/lib/cloud_controller/blobstore/webdav/dav_client_spec.rb
@@ -555,11 +555,9 @@ module Blobstore
           expect(httpclient).to have_received(:delete).with('http://localhost/admin/droplets/buildpack_cache/fo/ob/foobar/', header: {})
         end
 
-        it 'raises FileNotfound when the server returns 404' do
+        it 'does not fail when the collection does not exist' do
           allow(httpclient).to receive(:delete).and_return(instance_double(HTTP::Message, status: 404, content: ''))
-          expect {
-            client.delete_all_in_path('foobar')
-          }.to raise_error(FileNotFound, /Could not find object/)
+          client.delete_all_in_path('foobar')
           expect(httpclient).to have_received(:delete).with('http://localhost/admin/droplets/buildpack_cache/fo/ob/foobar/', header: {})
         end