From 2422a29b04515cc48741fa81072ed1465a3edc8d Mon Sep 17 00:00:00 2001 From: Paul Thornthwaite Date: Wed, 19 Feb 2014 11:33:18 +0000 Subject: [PATCH] [internetarchive] Correct test tagging The provider is declaring itself as "internetarchive" which does not match the tags "internet_archive" used on the tests. Since we blacklist the tests that are run, it meant they continued to run even if no credentials were present. --- tests/internet_archive/models/storage/directory_tests.rb | 2 +- tests/internet_archive/models/storage/file_tests.rb | 2 +- tests/internet_archive/models/storage/files_tests.rb | 2 +- tests/internet_archive/models/storage/url_tests.rb | 2 +- tests/internet_archive/requests/storage/acl_utils_tests.rb | 2 +- tests/internet_archive/requests/storage/bucket_tests.rb | 2 +- tests/internet_archive/requests/storage/cors_utils_tests.rb | 2 +- .../requests/storage/multipart_upload_tests.rb | 2 +- tests/internet_archive/requests/storage/object_tests.rb | 2 +- tests/internet_archive/signaturev4_tests.rb | 4 ++-- tests/internet_archive/signed_params_tests.rb | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/internet_archive/models/storage/directory_tests.rb b/tests/internet_archive/models/storage/directory_tests.rb index 7ac16872c..2faaeafab 100644 --- a/tests/internet_archive/models/storage/directory_tests.rb +++ b/tests/internet_archive/models/storage/directory_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests("Storage[:internet_archive] | directory", ["internet_archive"]) do +Shindo.tests("Storage[:internet_archive] | directory", ["internetarchive"]) do directory_attributes = { :key => "fogdirectorytests-#{rand(65536)}", diff --git a/tests/internet_archive/models/storage/file_tests.rb b/tests/internet_archive/models/storage/file_tests.rb index cfd53b93d..3f6d0c029 100644 --- a/tests/internet_archive/models/storage/file_tests.rb +++ b/tests/internet_archive/models/storage/file_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests("Storage[:internet_archive] | file", ["internet_archive"]) do +Shindo.tests("Storage[:internetarchive] | file", ["internetarchive"]) do # Fog.mock! diff --git a/tests/internet_archive/models/storage/files_tests.rb b/tests/internet_archive/models/storage/files_tests.rb index 5c480e35c..8587d4697 100644 --- a/tests/internet_archive/models/storage/files_tests.rb +++ b/tests/internet_archive/models/storage/files_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests("Storage[:internet_archive] | files", ["internet_archive"]) do +Shindo.tests("Storage[:internetarchive] | files", ["internetarchive"]) do file_attributes = { :key => 'fog_file_tests', diff --git a/tests/internet_archive/models/storage/url_tests.rb b/tests/internet_archive/models/storage/url_tests.rb index 345bc9428..798c5e25d 100644 --- a/tests/internet_archive/models/storage/url_tests.rb +++ b/tests/internet_archive/models/storage/url_tests.rb @@ -1,6 +1,6 @@ # encoding: utf-8 -Shindo.tests('InternetArchive | url', ["internet_archive"]) do +Shindo.tests('InternetArchive | url', ["internetarchive"]) do @expires = Time.utc(2013,1,1).utc.to_i diff --git a/tests/internet_archive/requests/storage/acl_utils_tests.rb b/tests/internet_archive/requests/storage/acl_utils_tests.rb index 763b42af7..ba17dc6df 100644 --- a/tests/internet_archive/requests/storage/acl_utils_tests.rb +++ b/tests/internet_archive/requests/storage/acl_utils_tests.rb @@ -1,6 +1,6 @@ require 'fog/internet_archive/requests/storage/acl_utils' -Shindo.tests('Fog::Storage::InternetArchive | ACL utils', ["internet_archive"]) do +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({}) diff --git a/tests/internet_archive/requests/storage/bucket_tests.rb b/tests/internet_archive/requests/storage/bucket_tests.rb index 195fa7b9c..a7a36213e 100644 --- a/tests/internet_archive/requests/storage/bucket_tests.rb +++ b/tests/internet_archive/requests/storage/bucket_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Fog::Storage[:internetarchive] | bucket requests', ["internet_archive"]) do +Shindo.tests('Fog::Storage[:internetarchive] | bucket requests', ["internetarchive"]) do @ia_bucket_name = 'fogbuckettests-' + Time.now.to_i.to_s(32) tests('success') do diff --git a/tests/internet_archive/requests/storage/cors_utils_tests.rb b/tests/internet_archive/requests/storage/cors_utils_tests.rb index 18dcea695..cd171635b 100644 --- a/tests/internet_archive/requests/storage/cors_utils_tests.rb +++ b/tests/internet_archive/requests/storage/cors_utils_tests.rb @@ -1,6 +1,6 @@ require 'fog/internet_archive/requests/storage/cors_utils' -Shindo.tests('Fog::Storage::InternetArchive | CORS utils', ["internet_archive"]) do +Shindo.tests('Fog::Storage::InternetArchive | CORS utils', ["internetarchive"]) do tests(".hash_to_cors") do tests(".hash_to_cors({}) at xpath //CORSConfiguration").returns("", "has an empty CORSConfiguration") do xml = Fog::Storage::InternetArchive.hash_to_cors({}) diff --git a/tests/internet_archive/requests/storage/multipart_upload_tests.rb b/tests/internet_archive/requests/storage/multipart_upload_tests.rb index 76f319264..77b061388 100644 --- a/tests/internet_archive/requests/storage/multipart_upload_tests.rb +++ b/tests/internet_archive/requests/storage/multipart_upload_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('Fog::Storage[:internetarchive] | multipart upload requests', ["internet_archive"]) do +Shindo.tests('Fog::Storage[:internetarchive] | multipart upload requests', ["internetarchive"]) do @directory = Fog::Storage[:internetarchive].directories.create(:key => "fogmultipartuploadtests-#{rand(65536)}") diff --git a/tests/internet_archive/requests/storage/object_tests.rb b/tests/internet_archive/requests/storage/object_tests.rb index f0bbda674..3e0c2625d 100644 --- a/tests/internet_archive/requests/storage/object_tests.rb +++ b/tests/internet_archive/requests/storage/object_tests.rb @@ -1,4 +1,4 @@ -Shindo.tests('InternetArchive::Storage | object requests', ['internet_archive']) do +Shindo.tests('InternetArchive::Storage | object requests', ['internetarchive']) do @directory = Fog::Storage[:internetarchive].directories.create(:key => 'fogobjecttests-' + Time.now.to_i.to_s(32)) @ia_owner = Fog::Storage[:internetarchive].get_bucket_acl(@directory.key).body['Owner'] diff --git a/tests/internet_archive/signaturev4_tests.rb b/tests/internet_archive/signaturev4_tests.rb index 1506cba74..9532a492a 100644 --- a/tests/internet_archive/signaturev4_tests.rb +++ b/tests/internet_archive/signaturev4_tests.rb @@ -1,6 +1,6 @@ # encoding: utf-8 -Shindo.tests('InternetArchive | signaturev4', ['internet_archive']) do +Shindo.tests('InternetArchive | signaturev4', ['internetarchive']) do # These testcases are from http://docs.amazonwebservices.com/general/latest/gr/signature-v4-test-suite.html @signer = Fog::InternetArchive::SignatureV4.new('AKIDEXAMPLE', 'wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY', 'us-east-1','host') @@ -38,4 +38,4 @@ Shindo.tests('InternetArchive | signaturev4', ['internet_archive']) do end end Fog::Time.now = ::Time.now -end \ No newline at end of file +end diff --git a/tests/internet_archive/signed_params_tests.rb b/tests/internet_archive/signed_params_tests.rb index 7d4253359..d2a0e6623 100644 --- a/tests/internet_archive/signed_params_tests.rb +++ b/tests/internet_archive/signed_params_tests.rb @@ -1,5 +1,5 @@ # encoding: utf-8 -Shindo.tests('InternetArchive | signed_params', ['internet_archive']) do +Shindo.tests('InternetArchive | signed_params', ['internetarchive']) do returns( Fog::InternetArchive.escape( "'Stöp!' said Fred_-~." ) ) { "%27St%C3%B6p%21%27%20said%20Fred_-~." } end