fog 1.40.0 → 1.41.0

data/spec/fog/bin/internetarchive_spec.rb

@@ -1,10 +0,0 @@
-require "minitest/autorun"
-require "fog"
-require "fog/bin"
-require "helpers/bin"
-
-describe InternetArchive do
-  include Fog::BinSpec
-
-  let(:subject) { InternetArchive }
-end

data/tests/internet_archive/models/storage/directory_tests.rb

@@ -1,42 +0,0 @@
-Shindo.tests("Storage[:internet_archive] | directory", ["internetarchive"]) do
-
-  directory_attributes = {
-    :key => "fogdirectorytests-#{rand(65536)}",
-    :collections => ['test_collection']
-  }
-
-  tests('success') do
-    params = directory_attributes
-    mocks_implemented = Fog.mocking?
-
-    collection = Fog::Storage[:internetarchive].directories
-    @instance = collection.new(params)
-
-    tests("#save").succeeds do
-      pending if Fog.mocking? && !mocks_implemented
-      @instance.save
-    end
-
-    tests("#public_url").returns("http://archive.org/details/#{directory_attributes[:key]}") do
-      @instance.public_url
-    end
-
-  end
-
-  tests("#set_metadata_array_headers") do
-    params = directory_attributes
-
-    collection = Fog::Storage[:internetarchive].directories
-    @instance = collection.new(params)
-
-    @instance.collections = ['test_collection', 'opensource']
-    @options = {}
-    @instance.set_metadata_array_headers(:collections, @options)
-
-    tests("#set_metadata_array_headers should set options").returns(true) do
-      @options['x-archive-meta01-collection'] == 'opensource' &&
-      @options['x-archive-meta02-collection'] == 'test_collection'
-    end
-  end
-
-end

data/tests/internet_archive/models/storage/file_tests.rb

@@ -1,61 +0,0 @@
-Shindo.tests("Storage[:internetarchive] | file", ["internetarchive"]) do
-
-  # Fog.mock!
-
-  require 'tempfile'
-
-  file_attributes = {
-    :key => 'fog_file_tests',
-    :body => lorem_file,
-    :public => true,
-    :auto_make_bucket => 1,
-  }
-
-  directory_attributes = {
-    # Add a random suffix to prevent collision
-    :key => "fogfilestests-#{rand(65536)}",
-    :collections => ['test_collection']
-  }
-
-  @directory = Fog::Storage[:internetarchive].directories.create(directory_attributes)
-
-  model_tests(@directory.files, file_attributes, Fog.mocking?) do
-
-    tests("#set_metadata_array_headers") do
-
-      @instance.collections = ['test_collection', 'opensource']
-      @options = {}
-      @instance.set_metadata_array_headers(:collections, @options)
-
-      tests("#set_metadata_array_headers should set options").returns(true) do
-        @options['x-archive-meta01-collection'] == 'opensource' &&
-        @options['x-archive-meta02-collection'] == 'test_collection'
-      end
-    end
-
-  end
-
-  model_tests(@directory.files, file_attributes, Fog.mocking?) do
-
-    tests("multipart upload") do
-      pending if Fog.mocking?
-
-      # A 6MB file
-      @large_file = Tempfile.new("fog-test-ia-s3-multipart")
-      6.times { @large_file.write("x" * (1024**2)) }
-      @large_file.rewind
-
-      tests("#save(:multipart_chunk_size => 5242880)").succeeds do
-        @directory.files.create(:key => 'multipart-upload', :body => @large_file, :multipart_chunk_size => 5242880)
-      end
-
-      @large_file.close
-
-    end
-
-  end
-
-  # @directory.versions.each(&:destroy)
-  @directory.destroy
-
-end

data/tests/internet_archive/models/storage/files_tests.rb

@@ -1,58 +0,0 @@
-Shindo.tests("Storage[:internetarchive] | files", ["internetarchive"]) do
-
-  file_attributes = {
-      :key => 'fog_file_tests',
-      :body => lorem_file,
-      :public => true,
-      :auto_make_bucket => 1,
-      :collections => ['test_collection']
-  }
-
-  directory_attributes = {
-      :key => "fogfilestests-#{rand(65536)}"
-  }
-
-  @directory = Fog::Storage[:internetarchive].directories.create(directory_attributes)
-  # @directory.versioning = true
-
-  model_tests(@directory.files, file_attributes, Fog.mocking?) do
-
-    @instance
-    # v2 = @directory.connection.put_object(@directory.key, @instance.key, 'version 2 content').headers['x-amz-version-id']
-    # v3 = @directory.connection.delete_object(@directory.key, @instance.key).headers['x-amz-version-id']
-    # v4 = @directory.connection.put_object(@directory.key, @instance.key, 'version 3 content').headers['x-amz-version-id']
-
-    # tests("#get") do
-    #   tests("#get without version fetches the latest version").returns(v4) do
-    #     @directory.files.get(@instance.key).version
-    #   end
-
-    #   tests("#get with version fetches that exact version").returns(v2) do
-    #     @directory.files.get(@instance.key, 'versionId' => v2).version
-    #   end
-
-    #   tests("#get with a deleted version returns nil").returns(nil) do
-    #     @directory.files.get(@instance.key, 'versionId' => v3)
-    #   end
-    # end
-
-    # tests("#head") do
-    #   tests("#head without version fetches the latest version").returns(v4) do
-    #     @directory.files.head(@instance.key).version
-    #   end
-
-    #   tests("#head with version fetches that exact version").returns(v2) do
-    #     @directory.files.head(@instance.key, 'versionId' => v2).version
-    #   end
-
-    #   tests("#head with a deleted version returns nil").returns(nil) do
-    #     @directory.files.head(@instance.key, 'versionId' => v3)
-    #   end
-    # end
-
-  end
-
-  # @directory.versions.each(&:destroy)
-  # @directory.destroy
-
-end

data/tests/internet_archive/models/storage/url_tests.rb

@@ -1,28 +0,0 @@
-# encoding: utf-8
-
-Shindo.tests('InternetArchive | url', ["internetarchive"]) do
-
-  @expires = Time.utc(2013,1,1).utc.to_i
-
-  @storage = Fog::Storage.new(
-    :provider => 'InternetArchive',
-    :ia_access_key_id => '123',
-    :ia_secret_access_key => 'abc',
-    :region => 'us-east-1'
-  )
-
-  @file = @storage.directories.new(:key => 'fognonbucket').files.new(:key => 'test.txt')
-
-  if Fog.mock?
-    signature = Fog::Storage::InternetArchive.new.signature(nil)
-  else
-    signature = 'tajHIhKHAdFYsigmzybCpaq8N0Q%3D'
-  end
-
-  tests('#url w/ response-cache-control').returns(
-    "http://fognonbucket.s3.us.archive.org/test.txt?response-cache-control=No-cache&AWSAccessKeyId=123&Signature=#{signature}&Expires=1356998400"
-  ) do
-    @file.url(@expires, :query => { 'response-cache-control' => 'No-cache' })
-  end
-
-end

data/tests/internet_archive/requests/storage/acl_utils_tests.rb

@@ -1,209 +0,0 @@
-require 'fog/internet_archive/requests/storage/acl_utils'
-
-Shindo.tests('Fog::Storage::InternetArchive | ACL utils', ["internetarchive"]) do
-  tests(".hash_to_acl") do
-    tests(".hash_to_acl({}) at xpath //AccessControlPolicy").returns("", "has an empty AccessControlPolicy") do
-      xml = Fog::Storage::InternetArchive.hash_to_acl({})
-      Nokogiri::XML(xml).xpath("//AccessControlPolicy").first.content.chomp
-    end
-
-    tests(".hash_to_acl({}) at xpath //AccessControlPolicy/Owner").returns(nil, "does not have an Owner element") do
-      xml = Fog::Storage::InternetArchive.hash_to_acl({})
-      Nokogiri::XML(xml).xpath("//AccessControlPolicy/Owner").first
-    end
-
-    tests(".hash_to_acl('Owner' => {}) at xpath //AccessControlPolicy/Owner").returns(nil, "does not have an Owner element") do
-      xml = Fog::Storage::InternetArchive.hash_to_acl('Owner' => {})
-      Nokogiri::XML(xml).xpath("//AccessControlPolicy/Owner").first
-    end
-
-    tests(".hash_to_acl('Owner' => {'ID' => 'abcdef0123456789'}) at xpath //AccessControlPolicy/Owner/ID").returns("abcdef0123456789", "returns the Owner ID") do
-      xml = Fog::Storage::InternetArchive.hash_to_acl('Owner' => {'ID' => 'abcdef0123456789'})
-      Nokogiri::XML(xml).xpath("//AccessControlPolicy/Owner/ID").first.content
-    end
-
-    tests(".hash_to_acl('Owner' => {'DisplayName' => 'bob'}) at xpath //AccessControlPolicy/Owner/ID").returns(nil, "does not have an Owner ID element") do
-      xml = Fog::Storage::InternetArchive.hash_to_acl('Owner' => {'DisplayName' => 'bob'})
-      Nokogiri::XML(xml).xpath("//AccessControlPolicy/Owner/ID").first
-    end
-
-    tests(".hash_to_acl('Owner' => {'DisplayName' => 'bob'}) at xpath //AccessControlPolicy/Owner/DisplayName").returns("bob", "returns the Owner DisplayName") do
-      xml = Fog::Storage::InternetArchive.hash_to_acl('Owner' => {'DisplayName' => 'bob'})
-      Nokogiri::XML(xml).xpath("//AccessControlPolicy/Owner/DisplayName").first.content
-    end
-
-    tests(".hash_to_acl('Owner' => {'ID' => 'abcdef0123456789'}) at xpath //AccessControlPolicy/Owner/DisplayName").returns(nil, "does not have an Owner DisplayName element") do
-      xml = Fog::Storage::InternetArchive.hash_to_acl('Owner' => {'ID' => 'abcdef0123456789'})
-      Nokogiri::XML(xml).xpath("//AccessControlPolicy/Owner/DisplayName").first
-    end
-
-    tests(".hash_to_acl({}) at xpath //AccessControlPolicy/AccessControlList").returns(nil, "has no AccessControlList") do
-      xml = Fog::Storage::InternetArchive.hash_to_acl({})
-      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlPolicy").first
-    end
-
-    acl = {
-      'AccessControlList' => [
-        {
-          'Grantee' => {
-            'ID' => 'abcdef0123456789',
-            'DisplayName' => 'bob'
-          },
-          'Permission' => 'READ'
-        }
-      ]
-    }
-
-    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee").returns("CanonicalUser", "has an xsi:type of CanonicalUser") do
-      xml = Fog::Storage::InternetArchive.hash_to_acl(acl)
-      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee").first.attributes["type"].value
-    end
-
-    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/ID").returns("abcdef0123456789", "returns the Grantee ID") do
-      xml = Fog::Storage::InternetArchive.hash_to_acl(acl)
-      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/ID").first.content
-    end
-
-    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/DisplayName").returns("bob", "returns the Grantee DisplayName") do
-      xml = Fog::Storage::InternetArchive.hash_to_acl(acl)
-      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/DisplayName").first.content
-    end
-
-    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Permission").returns("READ", "returns the Grantee Permission") do
-      xml = Fog::Storage::InternetArchive.hash_to_acl(acl)
-      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Permission").first.content
-    end
-
-    acl = {
-      'AccessControlList' => [
-        {
-          'Grantee' => {
-            'EmailAddress' => 'user@example.com'
-          },
-          'Permission' => 'FULL_CONTROL'
-        }
-      ]
-    }
-
-    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee").returns("AmazonCustomerByEmail", "has an xsi:type of AmazonCustomerByEmail") do
-      xml = Fog::Storage::InternetArchive.hash_to_acl(acl)
-      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee").first.attributes["type"].value
-    end
-
-    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/EmailAddress").returns("user@example.com", "returns the Grantee EmailAddress") do
-      xml = Fog::Storage::InternetArchive.hash_to_acl(acl)
-      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/EmailAddress").first.content
-    end
-
-    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Permission").returns("FULL_CONTROL", "returns the Grantee Permission") do
-      xml = Fog::Storage::InternetArchive.hash_to_acl(acl)
-      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Permission").first.content
-    end
-
-    acl = {
-      'AccessControlList' => [
-        {
-          'Grantee' => {
-            'URI' => 'http://acs.amazonaws.com/groups/global/AllUsers'
-          },
-          'Permission' => 'WRITE'
-        }
-      ]
-    }
-
-    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee").returns("Group", "has an xsi:type of Group") do
-      xml = Fog::Storage::InternetArchive.hash_to_acl(acl)
-      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee").first.attributes["type"].value
-    end
-
-    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/URI").returns("http://acs.amazonaws.com/groups/global/AllUsers", "returns the Grantee URI") do
-      xml = Fog::Storage::InternetArchive.hash_to_acl(acl)
-      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/URI").first.content
-    end
-
-    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Permission").returns("WRITE", "returns the Grantee Permission") do
-      xml = Fog::Storage::InternetArchive.hash_to_acl(acl)
-      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Permission").first.content
-    end
-
-    acl = {
-      'AccessControlList' => [
-        {
-          'Grantee' => {
-            'ID' => 'abcdef0123456789',
-            'DisplayName' => 'bob'
-          },
-          'Permission' => 'READ'
-        },
-        {
-          'Grantee' => {
-            'EmailAddress' => 'user@example.com'
-          },
-          'Permission' => 'FULL_CONTROL'
-        },
-        {
-          'Grantee' => {
-            'URI' => 'http://acs.amazonaws.com/groups/global/AllUsers'
-          },
-          'Permission' => 'WRITE'
-        }
-      ]
-    }
-
-    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant").returns(3, "has three elements") do
-      xml = Fog::Storage::InternetArchive.hash_to_acl(acl)
-      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant").size
-    end
-
-    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/ID").returns("abcdef0123456789", "returns the first Grant's Grantee ID") do
-      xml = Fog::Storage::InternetArchive.hash_to_acl(acl)
-      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/ID").first.content
-    end
-
-    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/EmailAddress").returns("user@example.com", "returns the second Grant's Grantee EmailAddress") do
-      xml = Fog::Storage::InternetArchive.hash_to_acl(acl)
-      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/EmailAddress").first.content
-    end
-
-    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/URI").returns("http://acs.amazonaws.com/groups/global/AllUsers", "returns the third Grant's Grantee URI") do
-      xml = Fog::Storage::InternetArchive.hash_to_acl(acl)
-      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/URI").first.content
-    end
-  end
-
-  tests(".acl_to_hash") do
-    acl_xml = <<-XML
-<AccessControlPolicy>
-  <Owner>
-    <ID>2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0</ID>
-    <DisplayName>me</DisplayName>
-  </Owner>
-  <AccessControlList>
-    <Grant>
-      <Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="CanonicalUser">
-        <ID>2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0</ID>
-        <DisplayName>me</DisplayName>
-      </Grantee>
-      <Permission>FULL_CONTROL</Permission>
-    </Grant>
-  </AccessControlList>
-</AccessControlPolicy>
-XML
-
-    tests(".acl_to_hash(#{acl_xml.inspect})").returns({
-      "Owner" => {
-        "DisplayName" => "me",
-        "ID" => "2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0"
-      },
-      "AccessControlList" => [{
-        "Grantee" => {
-          "DisplayName" => "me",
-          "ID" => "2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0"
-        },
-        "Permission" => "FULL_CONTROL"
-      }]
-    }, 'returns hash of ACL XML') do
-      Fog::Storage::InternetArchive.acl_to_hash(acl_xml)
-    end
-  end
-end

data/tests/internet_archive/requests/storage/bucket_tests.rb

@@ -1,324 +0,0 @@
-Shindo.tests('Fog::Storage[:internetarchive] | bucket requests', ["internetarchive"]) do
-  @ia_bucket_name = 'fogbuckettests-' + Time.now.to_i.to_s(32)
-
-  tests('success') do
-
-    @bucket_format = {
-      'CommonPrefixes'  => [],
-      'IsTruncated'     => Fog::Boolean,
-      'Marker'          => NilClass,
-      'MaxKeys'         => Integer,
-      'Name'            => String,
-      'Prefix'          => NilClass,
-      'Contents'    => [{
-        'ETag'          => String,
-        'Key'           => String,
-        'LastModified'  => Time,
-        'Owner' => {
-          'DisplayName' => String,
-          'ID'          => String
-        },
-        'Size' => Integer
-      }]
-    }
-    @bucket_lifecycle_format = {
-      'Rules' => [{
-         'ID'         => String,
-         'Prefix'     => Fog::Nullable::String,
-         'Enabled'    => Fog::Boolean,
-         'Expiration' => Fog::Nullable::Hash,
-         'Transition' => Fog::Nullable::Hash
-       }]
-    }
-
-    @service_format = {
-      'Buckets' => [{
-        'CreationDate'  => Time,
-        'Name'          => String,
-      }],
-      'Owner'   => {
-        'DisplayName' => String,
-        'ID'          => String
-      }
-    }
-
-    tests("#put_bucket('#{@ia_bucket_name}')").succeeds do
-      Fog::Storage[:internetarchive].put_bucket(@ia_bucket_name)
-      @aws_owner = Fog::Storage[:internetarchive].get_bucket_acl(Fog::Storage[:internetarchive].directories.first.key).body['Owner']
-    end
-
-    tests("#get_service").formats(@service_format) do
-      Fog::Storage[:internetarchive].get_service.body
-    end
-
-    dirs = Fog::Storage[:internetarchive].directories.get(@ia_bucket_name)
-    file = Fog::Storage[:internetarchive].directories.get(@ia_bucket_name).files.create(:body => 'y', :key => 'x')
-
-    tests("#get_bucket('#{@ia_bucket_name}')").formats(@bucket_format) do
-      Fog::Storage[:internetarchive].get_bucket(@ia_bucket_name).body
-    end
-
-    file.destroy
-
-    file1 = Fog::Storage[:internetarchive].directories.get(@ia_bucket_name).files.create(:body => 'a',    :key => 'a/a1/file1')
-    file2 = Fog::Storage[:internetarchive].directories.get(@ia_bucket_name).files.create(:body => 'ab',   :key => 'a/file2')
-    file3 = Fog::Storage[:internetarchive].directories.get(@ia_bucket_name).files.create(:body => 'abc',  :key => 'b/file3')
-    file4 = Fog::Storage[:internetarchive].directories.get(@ia_bucket_name).files.create(:body => 'abcd', :key => 'file4')
-
-    tests("#get_bucket('#{@ia_bucket_name}')") do
-      before do
-        @bucket = Fog::Storage[:internetarchive].get_bucket(@ia_bucket_name)
-      end
-
-      tests(".body['Contents'].map{|n| n['Key']}").returns(["a/a1/file1", "a/file2", "b/file3", "file4"]) do
-        @bucket.body['Contents'].map{|n| n['Key']}
-      end
-
-      tests(".body['Contents'].map{|n| n['Size']}").returns([1, 2, 3, 4]) do
-        @bucket.body['Contents'].map{|n| n['Size']}
-      end
-
-      tests(".body['CommonPrefixes']").returns([]) do
-        @bucket.body['CommonPrefixes']
-      end
-    end
-
-    tests("#get_bucket('#{@ia_bucket_name}', 'delimiter' => '/')") do
-      before do
-        @bucket = Fog::Storage[:internetarchive].get_bucket(@ia_bucket_name, 'delimiter' => '/')
-      end
-
-      tests(".body['Contents'].map{|n| n['Key']}").returns(['file4']) do
-        @bucket.body['Contents'].map{|n| n['Key']}
-      end
-
-      tests(".body['CommonPrefixes']").returns(['a/', 'b/']) do
-        @bucket.body['CommonPrefixes']
-      end
-    end
-
-    tests("#get_bucket('#{@ia_bucket_name}', 'delimiter' => '/', 'prefix' => 'a/')") do
-      before do
-        @bucket = Fog::Storage[:internetarchive].get_bucket(@ia_bucket_name, 'delimiter' => '/', 'prefix' => 'a/')
-      end
-
-      tests(".body['Contents'].map{|n| n['Key']}").returns(['a/file2']) do
-        @bucket.body['Contents'].map{|n| n['Key']}
-      end
-
-      tests(".body['CommonPrefixes']").returns(['a/a1/']) do
-        @bucket.body['CommonPrefixes']
-      end
-    end
-
-    file1.destroy; file2.destroy; file3.destroy; file4.destroy
-
-    tests("#get_bucket_location('#{@ia_bucket_name}')").formats('LocationConstraint' => NilClass) do
-      Fog::Storage[:internetarchive].get_bucket_location(@ia_bucket_name).body
-    end
-
-    tests("#get_request_payment('#{@ia_bucket_name}')").formats('Payer' => String) do
-      Fog::Storage[:internetarchive].get_request_payment(@ia_bucket_name).body
-    end
-
-    tests("#put_request_payment('#{@ia_bucket_name}', 'Requester')").succeeds do
-      Fog::Storage[:internetarchive].put_request_payment(@ia_bucket_name, 'Requester')
-    end
-
-    tests("#put_bucket_website('#{@ia_bucket_name}', 'index.html')").succeeds do
-      Fog::Storage[:internetarchive].put_bucket_website(@ia_bucket_name, 'index.html')
-    end
-
-    tests("#put_bucket_acl('#{@ia_bucket_name}', 'private')").succeeds do
-      Fog::Storage[:internetarchive].put_bucket_acl(@ia_bucket_name, 'private')
-    end
-
-    acl = {
-      'Owner' => @aws_owner,
-      'AccessControlList' => [
-        {
-          'Grantee' => @aws_owner,
-          'Permission' => "FULL_CONTROL"
-        }
-      ]
-    }
-    tests("#put_bucket_acl('#{@ia_bucket_name}', hash with id)").returns(acl) do
-      Fog::Storage[:internetarchive].put_bucket_acl(@ia_bucket_name, acl)
-      Fog::Storage[:internetarchive].get_bucket_acl(@ia_bucket_name).body
-    end
-
-    tests("#put_bucket_acl('#{@ia_bucket_name}', hash with email)").returns({
-        'Owner' => @aws_owner,
-        'AccessControlList' => [
-          {
-            'Grantee' => { 'ID' => 'f62f0218873cfa5d56ae9429ae75a592fec4fd22a5f24a20b1038a7db9a8f150', 'DisplayName' => 'mtd' },
-            'Permission' => "FULL_CONTROL"
-          }
-        ]
-    }) do
-      pending if Fog.mocking?
-      Fog::Storage[:internetarchive].put_bucket_acl(@ia_bucket_name, {
-        'Owner' => @aws_owner,
-        'AccessControlList' => [
-          {
-            'Grantee' => { 'EmailAddress' => 'mtd@amazon.com' },
-            'Permission' => "FULL_CONTROL"
-          }
-        ]
-      })
-      Fog::Storage[:internetarchive].get_bucket_acl(@ia_bucket_name).body
-    end
-
-    acl = {
-      'Owner' => @aws_owner,
-      'AccessControlList' => [
-        {
-          'Grantee' => { 'URI' => 'http://acs.amazonaws.com/groups/global/AllUsers' },
-          'Permission' => "FULL_CONTROL"
-        }
-      ]
-    }
-    tests("#put_bucket_acl('#{@ia_bucket_name}', hash with uri)").returns(acl) do
-      Fog::Storage[:internetarchive].put_bucket_acl(@ia_bucket_name, acl)
-      Fog::Storage[:internetarchive].get_bucket_acl(@ia_bucket_name).body
-    end
-
-    tests("#delete_bucket_website('#{@ia_bucket_name}')").succeeds do
-      pending if Fog.mocking?
-      Fog::Storage[:internetarchive].delete_bucket_website(@ia_bucket_name)
-    end
-
-    tests('bucket lifecycle') do
-      pending if Fog.mocking?
-
-      lifecycle = {'Rules' => [{'ID' => 'test rule', 'Prefix' => '/prefix', 'Enabled' => true, 'Days' => 42}]}
-      tests('non-existant bucket') do
-        tests('#put_bucket_lifecycle').returns([404, 'NoSuchBucket']) do
-          begin
-            Fog::Storage[:internetarchive].put_bucket_lifecycle('fognonbucket', lifecycle)
-          rescue Excon::Errors::NotFound => e
-            [e.response.status, e.response.body.match(%r{<Code>(.*)</Code>})[1]]
-          end
-        end
-        tests('#get_bucket_lifecycle').returns([404, 'NoSuchBucket']) do
-          begin
-            Fog::Storage[:internetarchive].get_bucket_lifecycle('fognonbucket')
-          rescue Excon::Errors::NotFound => e
-            [e.response.status, e.response.body.match(%r{<Code>(.*)</Code>})[1]]
-          end
-        end
-        tests('#delete_bucket_lifecycle').returns([404, 'NoSuchBucket']) do
-          begin
-            Fog::Storage[:internetarchive].delete_bucket_lifecycle('fognonbucket')
-          rescue Excon::Errors::NotFound => e
-            [e.response.status, e.response.body.match(%r{<Code>(.*)</Code>})[1]]
-          end
-        end
-      end
-      tests('no lifecycle') do
-        tests('#get_bucket_lifecycle').returns([404, 'NoSuchLifecycleConfiguration']) do
-          begin
-            Fog::Storage[:internetarchive].get_bucket_lifecycle(@ia_bucket_name)
-          rescue Excon::Errors::NotFound => e
-            [e.response.status, e.response.body.match(%r{<Code>(.*)</Code>})[1]]
-          end
-        end
-        tests('#delete_bucket_lifecycle').succeeds do
-          Fog::Storage[:internetarchive].delete_bucket_lifecycle(@ia_bucket_name)
-        end
-      end
-      tests('create').succeeds do
-        Fog::Storage[:internetarchive].put_bucket_lifecycle(@ia_bucket_name, lifecycle)
-      end
-      tests('read').formats(@bucket_lifecycle_format) do
-        Fog::Storage[:internetarchive].get_bucket_lifecycle(@ia_bucket_name).body
-      end
-      lifecycle = { 'Rules' => 5.upto(6).map { |i| {'ID' => "rule\##{i}", 'Prefix' => i.to_s, 'Enabled' => true, 'Days' => i} } }
-      lifecycle_return = { 'Rules' => 5.upto(6).map { |i| {'ID' => "rule\##{i}", 'Prefix' => i.to_s, 'Enabled' => true, 'Expiration' => {'Days' => i}} } }
-      tests('update').returns(lifecycle_return) do
-        Fog::Storage[:internetarchive].put_bucket_lifecycle(@ia_bucket_name, lifecycle)
-        Fog::Storage[:internetarchive].get_bucket_lifecycle(@ia_bucket_name).body
-      end
-      lifecycle = {'Rules' => [{'ID' => 'test rule', 'Prefix' => '/prefix', 'Enabled' => true, 'Expiration' => {'Date' => '2012-12-31T00:00:00.000Z'}}]}
-      tests('date').returns(lifecycle) do
-        Fog::Storage[:internetarchive].put_bucket_lifecycle(@ia_bucket_name, lifecycle)
-        Fog::Storage[:internetarchive].get_bucket_lifecycle(@ia_bucket_name).body
-      end
-      tests('delete').succeeds do
-          Fog::Storage[:internetarchive].delete_bucket_lifecycle(@ia_bucket_name)
-      end
-      tests('read').returns([404, 'NoSuchLifecycleConfiguration']) do
-        begin
-          Fog::Storage[:internetarchive].get_bucket_lifecycle(@ia_bucket_name)
-        rescue Excon::Errors::NotFound => e
-          [e.response.status, e.response.body.match(%r{<Code>(.*)</Code>})[1]]
-        end
-      end
-    end
-
-    tests("put_bucket_cors('#{@ia_bucket_name}', cors)").succeeds do
-      cors =  {'CORSConfiguration' =>
-                  [
-                    {
-                      'AllowedOrigin' => 'http://localhost:3000',
-                      'AllowedMethod' => ['POST', 'GET'],
-                      'AllowedHeader' => '*',
-                      'MaxAgeSeconds' => 3000
-                    }
-                  ]
-              }
-      Fog::Storage[:internetarchive].put_bucket_cors(@ia_bucket_name, cors)
-    end
-
-    tests("#delete_bucket('#{@ia_bucket_name}')").succeeds do
-      Fog::Storage[:internetarchive].delete_bucket(@ia_bucket_name)
-    end
-
-  end
-
-  # tests('failure') do
-
-  #   tests("#delete_bucket('fognonbucket')").raises(Excon::Errors::NotFound) do
-  #     Fog::Storage[:internetarchive].delete_bucket('fognonbucket')
-  #   end
-
-  #   @fognonempty = "fognonempty-#{rand(65536)}"
-  #   @bucket = Fog::Storage[:internetarchive].directories.create(:key => "fognonempty-#{rand(65536)}")
-  #   @file = @bucket.files.create(:key => 'foo', :body => 'bar')
-
-  #   tests("#delete_bucket('fognonempty')").raises(Excon::Errors::Conflict) do
-  #     Fog::Storage[:internetarchive].delete_bucket('fognonempty')
-  #   end
-
-  #   @file.destroy
-  #   @bucket.destroy
-
-  #   tests("#get_bucket('fognonbucket')").raises(Excon::Errors::NotFound) do
-  #     Fog::Storage[:internetarchive].get_bucket('fognonbucket')
-  #   end
-
-  #   tests("#get_bucket_location('fognonbucket')").raises(Excon::Errors::NotFound) do
-  #     Fog::Storage[:internetarchive].get_bucket_location('fognonbucket')
-  #   end
-
-  #   tests("#get_request_payment('fognonbucket')").raises(Excon::Errors::NotFound) do
-  #     Fog::Storage[:internetarchive].get_request_payment('fognonbucket')
-  #   end
-
-  #   tests("#put_request_payment('fognonbucket', 'Requester')").raises(Excon::Errors::NotFound) do
-  #     Fog::Storage[:internetarchive].put_request_payment('fognonbucket', 'Requester')
-  #   end
-
-  #   tests("#put_bucket_acl('fognonbucket', 'invalid')").raises(Excon::Errors::BadRequest) do
-  #     Fog::Storage[:internetarchive].put_bucket_acl('fognonbucket', 'invalid')
-  #   end
-
-  #   tests("#put_bucket_website('fognonbucket', 'index.html')").raises(Excon::Errors::NotFound) do
-  #     Fog::Storage[:internetarchive].put_bucket_website('fognonbucket', 'index.html')
-  #   end
-
-  # end
-
-  # don't keep the bucket around
-  # Fog::Storage[:internetarchive].delete_bucket(@ia_bucket_name) rescue nil
-end