From e5dfbff82d86c66296fde99e29a51ff2ceadf1a0 Mon Sep 17 00:00:00 2001 From: Garret Alfert Date: Thu, 10 Oct 2013 14:57:10 +0200 Subject: [PATCH] Test that files get deleted from Riak CS --- spec/riak_spec.rb | 6 ++---- spec/spec_helper.rb | 13 +++++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/spec/riak_spec.rb b/spec/riak_spec.rb index acb98f9..c34a601 100644 --- a/spec/riak_spec.rb +++ b/spec/riak_spec.rb @@ -428,10 +428,8 @@ describe "App with Riak backend" do it "removes the binary object" do last_response.status.must_equal 204 - skip "check if object is removed from Riak CS" - # lambda { - # binary_bucket.get("jimmy:documents:jaypeg") - # }.must_raise Riak::HTTPFailedRequest + binary = cs_binary_bucket.files.get("jimmy:documents:jaypeg") + binary.must_be_nil end it "logs the operation" do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 03c5f41..49c1bb5 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -77,6 +77,19 @@ if app.settings.riak end end + def cs_client + @cs_client ||= Fog::Storage.new({ + :provider => 'AWS', + :aws_access_key_id => app.settings.riak['riak_cs']['access_key'], + :aws_secret_access_key => app.settings.riak['riak_cs']['secret_key'], + :endpoint => app.settings.riak['riak_cs']['endpoint'] + }) + end + + def cs_binary_bucket + @cs_binary_bucket ||= cs_client.directories.create(:key => app.settings.riak['buckets']['cs_binaries']) + end + def purge_all_buckets [data_bucket, directory_bucket, auth_bucket, binary_bucket, opslog_bucket].each do |bucket| bucket.keys.each {|key| bucket.delete key}