From d3872679b815e24a0f999988cdeda84bcf5e1d92 Mon Sep 17 00:00:00 2001 From: geemus Date: Wed, 29 Dec 2010 17:23:40 -0800 Subject: [PATCH] [dns] consolidate tests --- tests/aws/models/dns/zone_tests.rb | 5 ----- tests/aws/models/dns/zones_tests.rb | 5 ----- tests/dns/helper.rb | 14 ++++++++++++++ tests/dns/models/record_tests.rb | 17 +++++++++++++++++ tests/dns/models/records_tests.rb | 17 +++++++++++++++++ tests/dns/models/zone_tests.rb | 9 +++++++++ tests/dns/models/zones_tests.rb | 9 +++++++++ .../dns => dns/requests/aws}/dns_tests.rb | 0 .../dns => dns/requests/linode}/dns_tests.rb | 0 .../requests/slicehost}/dns_tests.rb | 0 .../dns => dns/requests/zerigo}/dns_tests.rb | 0 tests/helper.rb | 5 ----- tests/helpers/dns/record_tests.rb | 13 ------------- tests/helpers/dns/records_tests.rb | 13 ------------- tests/helpers/dns/zone_tests.rb | 7 ------- tests/helpers/dns/zones_tests.rb | 7 ------- tests/linode/models/dns/record_tests.rb | 5 ----- tests/linode/models/dns/records_tests.rb | 5 ----- tests/linode/models/dns/zone_tests.rb | 11 ----------- tests/linode/models/dns/zones_tests.rb | 5 ----- tests/slicehost/models/dns/record_tests.rb | 5 ----- tests/slicehost/models/dns/records_tests.rb | 5 ----- tests/slicehost/models/dns/zone_tests.rb | 5 ----- tests/slicehost/models/dns/zones_tests.rb | 5 ----- tests/zerigo/helper.rb | 0 tests/zerigo/models/dns/record_tests.rb | 5 ----- tests/zerigo/models/dns/records_tests.rb | 5 ----- tests/zerigo/models/dns/zone_tests.rb | 5 ----- tests/zerigo/models/dns/zones_tests.rb | 5 ----- 29 files changed, 66 insertions(+), 121 deletions(-) delete mode 100644 tests/aws/models/dns/zone_tests.rb delete mode 100644 tests/aws/models/dns/zones_tests.rb create mode 100644 tests/dns/helper.rb create mode 100644 tests/dns/models/record_tests.rb create mode 100644 tests/dns/models/records_tests.rb create mode 100644 tests/dns/models/zone_tests.rb create mode 100644 tests/dns/models/zones_tests.rb rename tests/{aws/requests/dns => dns/requests/aws}/dns_tests.rb (100%) rename tests/{linode/requests/dns => dns/requests/linode}/dns_tests.rb (100%) rename tests/{slicehost/requests/dns_tests => dns/requests/slicehost}/dns_tests.rb (100%) rename tests/{zerigo/requests/dns => dns/requests/zerigo}/dns_tests.rb (100%) delete mode 100644 tests/helpers/dns/record_tests.rb delete mode 100644 tests/helpers/dns/records_tests.rb delete mode 100644 tests/helpers/dns/zone_tests.rb delete mode 100644 tests/helpers/dns/zones_tests.rb delete mode 100644 tests/linode/models/dns/record_tests.rb delete mode 100644 tests/linode/models/dns/records_tests.rb delete mode 100644 tests/linode/models/dns/zone_tests.rb delete mode 100644 tests/linode/models/dns/zones_tests.rb delete mode 100644 tests/slicehost/models/dns/record_tests.rb delete mode 100644 tests/slicehost/models/dns/records_tests.rb delete mode 100644 tests/slicehost/models/dns/zone_tests.rb delete mode 100644 tests/slicehost/models/dns/zones_tests.rb delete mode 100644 tests/zerigo/helper.rb delete mode 100644 tests/zerigo/models/dns/record_tests.rb delete mode 100644 tests/zerigo/models/dns/records_tests.rb delete mode 100644 tests/zerigo/models/dns/zone_tests.rb delete mode 100644 tests/zerigo/models/dns/zones_tests.rb diff --git a/tests/aws/models/dns/zone_tests.rb b/tests/aws/models/dns/zone_tests.rb deleted file mode 100644 index c3ee8ec01..000000000 --- a/tests/aws/models/dns/zone_tests.rb +++ /dev/null @@ -1,5 +0,0 @@ -Shindo.tests('AWS::DNS | zone model', ['aws']) do - - zone_tests(AWS[:dns], {}, false) - -end diff --git a/tests/aws/models/dns/zones_tests.rb b/tests/aws/models/dns/zones_tests.rb deleted file mode 100644 index e9fdcb8e1..000000000 --- a/tests/aws/models/dns/zones_tests.rb +++ /dev/null @@ -1,5 +0,0 @@ -Shindo.tests('AWS::DNS | zones collection', ['aws']) do - - zones_tests(AWS[:dns], {}, false) - -end diff --git a/tests/dns/helper.rb b/tests/dns/helper.rb new file mode 100644 index 000000000..d41b03364 --- /dev/null +++ b/tests/dns/helper.rb @@ -0,0 +1,14 @@ +dns_providers = { + AWS => { + :mocked => false + }, + Linode => { + :mocked => false + }, + Slicehost => { + :mocked => false + }, + Zerigo => { + :mocked => false + } +} \ No newline at end of file diff --git a/tests/dns/models/record_tests.rb b/tests/dns/models/record_tests.rb new file mode 100644 index 000000000..8a4f2a96f --- /dev/null +++ b/tests/dns/models/record_tests.rb @@ -0,0 +1,17 @@ +for provider, config in dns_providers + + params = { + :ip => '1.2.3.4', + :name => 'www.fogrecordtests.com', + :type => 'A' + }.merge!(config[:record_params] || {}) + + if !Fog.mocking? || provider[:mocked] + @zone = provider[:dns].zones.create(:domain => 'fogrecordtests.com') + + model_tests(@zone.records, params, config[:mocked]) + + @zone.destroy + end + +end \ No newline at end of file diff --git a/tests/dns/models/records_tests.rb b/tests/dns/models/records_tests.rb new file mode 100644 index 000000000..197d4f13a --- /dev/null +++ b/tests/dns/models/records_tests.rb @@ -0,0 +1,17 @@ +for provider, config in dns_providers + + params = { + :ip => '1.2.3.4', + :name => 'www.fogrecordstests.com', + :type => 'A' + }.merge!(config[:records_params] || {}) + + if !Fog.mocking? || provider[:mocked] + @zone = provider[:dns].zones.create(:domain => 'fogrecordstests.com') + + collection_tests(@zone.records, params, config[:mocked]) + + @zone.destroy + end + +end \ No newline at end of file diff --git a/tests/dns/models/zone_tests.rb b/tests/dns/models/zone_tests.rb new file mode 100644 index 000000000..64b828bfa --- /dev/null +++ b/tests/dns/models/zone_tests.rb @@ -0,0 +1,9 @@ +for provider, config in dns_providers + + params = { + :domain => 'fogzonetests.com' + }.merge!(config[:zone_params] || {}) + + model_tests(provider[:dns].zones, params, config[:mocked]) + +end \ No newline at end of file diff --git a/tests/dns/models/zones_tests.rb b/tests/dns/models/zones_tests.rb new file mode 100644 index 000000000..8e7749ea9 --- /dev/null +++ b/tests/dns/models/zones_tests.rb @@ -0,0 +1,9 @@ +for provider, config in dns_providers + + params = { + :domain => 'fogzonestests.com' + }.merge!(config[:zones_params] || {}) + + collection_tests(provider[:dns].zones, params, config[:mocked]) + +end diff --git a/tests/aws/requests/dns/dns_tests.rb b/tests/dns/requests/aws/dns_tests.rb similarity index 100% rename from tests/aws/requests/dns/dns_tests.rb rename to tests/dns/requests/aws/dns_tests.rb diff --git a/tests/linode/requests/dns/dns_tests.rb b/tests/dns/requests/linode/dns_tests.rb similarity index 100% rename from tests/linode/requests/dns/dns_tests.rb rename to tests/dns/requests/linode/dns_tests.rb diff --git a/tests/slicehost/requests/dns_tests/dns_tests.rb b/tests/dns/requests/slicehost/dns_tests.rb similarity index 100% rename from tests/slicehost/requests/dns_tests/dns_tests.rb rename to tests/dns/requests/slicehost/dns_tests.rb diff --git a/tests/zerigo/requests/dns/dns_tests.rb b/tests/dns/requests/zerigo/dns_tests.rb similarity index 100% rename from tests/zerigo/requests/dns/dns_tests.rb rename to tests/dns/requests/zerigo/dns_tests.rb diff --git a/tests/helper.rb b/tests/helper.rb index 64f1cef1c..9ecd51e92 100644 --- a/tests/helper.rb +++ b/tests/helper.rb @@ -14,11 +14,6 @@ require 'helpers/compute/flavors_tests' require 'helpers/compute/server_tests' require 'helpers/compute/servers_tests' -require 'helpers/dns/record_tests' -require 'helpers/dns/records_tests' -require 'helpers/dns/zone_tests' -require 'helpers/dns/zones_tests' - require 'helpers/storage/directory_tests' require 'helpers/storage/directories_tests' require 'helpers/storage/file_tests' diff --git a/tests/helpers/dns/record_tests.rb b/tests/helpers/dns/record_tests.rb deleted file mode 100644 index 963e60cdd..000000000 --- a/tests/helpers/dns/record_tests.rb +++ /dev/null @@ -1,13 +0,0 @@ -def record_tests(connection, params = {}, mocks_implemented = true) - - params = {:ip => '1.2.3.4', :name => 'www.fogrecordtests.com', :type => 'A'}.merge!(params) - - if !Fog.mocking? || mocks_implemented - @zone = connection.zones.create(:domain => 'fogrecordtests.com') - - model_tests(@zone.records, params, mocks_implemented) - - @zone.destroy - end - -end diff --git a/tests/helpers/dns/records_tests.rb b/tests/helpers/dns/records_tests.rb deleted file mode 100644 index 90041a235..000000000 --- a/tests/helpers/dns/records_tests.rb +++ /dev/null @@ -1,13 +0,0 @@ -def records_tests(connection, params = {}, mocks_implemented = true) - - params = {:ip => '1.2.3.4', :name => 'www.fogrecordstests.com', :type => 'A'}.merge!(params) - - if !Fog.mocking? || mocks_implemented - @zone = connection.zones.create(:domain => 'fogrecordstests.com') - - collection_tests(@zone.records, params, mocks_implemented) - - @zone.destroy - end - -end diff --git a/tests/helpers/dns/zone_tests.rb b/tests/helpers/dns/zone_tests.rb deleted file mode 100644 index 6695565da..000000000 --- a/tests/helpers/dns/zone_tests.rb +++ /dev/null @@ -1,7 +0,0 @@ -def zone_tests(connection, params = {}, mocks_implemented = true) - - params = {:domain => 'fogzonetests.com'}.merge!(params) - - model_tests(connection.zones, params, mocks_implemented) - -end diff --git a/tests/helpers/dns/zones_tests.rb b/tests/helpers/dns/zones_tests.rb deleted file mode 100644 index 4f495d0e0..000000000 --- a/tests/helpers/dns/zones_tests.rb +++ /dev/null @@ -1,7 +0,0 @@ -def zones_tests(connection, params = {}, mocks_implemented = true) - - params = {:domain => 'fogzonestests.com'}.merge!(params) - - collection_tests(connection.zones, params, mocks_implemented) - -end diff --git a/tests/linode/models/dns/record_tests.rb b/tests/linode/models/dns/record_tests.rb deleted file mode 100644 index 5cfac8044..000000000 --- a/tests/linode/models/dns/record_tests.rb +++ /dev/null @@ -1,5 +0,0 @@ -Shindo.tests('Linode::DNS | record model', ['linode']) do - - record_tests(Linode[:dns], {}, false) - -end diff --git a/tests/linode/models/dns/records_tests.rb b/tests/linode/models/dns/records_tests.rb deleted file mode 100644 index 8a262bfd1..000000000 --- a/tests/linode/models/dns/records_tests.rb +++ /dev/null @@ -1,5 +0,0 @@ -Shindo.tests('Linode::DNS | records collection', ['linode']) do - - records_tests(Linode[:dns], {}, false) - -end diff --git a/tests/linode/models/dns/zone_tests.rb b/tests/linode/models/dns/zone_tests.rb deleted file mode 100644 index 3f14342c4..000000000 --- a/tests/linode/models/dns/zone_tests.rb +++ /dev/null @@ -1,11 +0,0 @@ -Shindo.tests('Linode::DNS | zone model', ['linode']) do - - zone_tests(Linode[:dns], {}, false) do - - if !Fog.mocking? || mocks_implemented - @instance.responds_to(:nameservers) - end - - end - -end diff --git a/tests/linode/models/dns/zones_tests.rb b/tests/linode/models/dns/zones_tests.rb deleted file mode 100644 index 2f4e4b424..000000000 --- a/tests/linode/models/dns/zones_tests.rb +++ /dev/null @@ -1,5 +0,0 @@ -Shindo.tests('Linode::DNS | zones collection', ['linode']) do - - zones_tests(Linode[:dns], {}, false) - -end diff --git a/tests/slicehost/models/dns/record_tests.rb b/tests/slicehost/models/dns/record_tests.rb deleted file mode 100644 index 2317ea9c9..000000000 --- a/tests/slicehost/models/dns/record_tests.rb +++ /dev/null @@ -1,5 +0,0 @@ -Shindo.tests('Slicehost::DNS | record model', ['slicehost']) do - - record_tests(Slicehost[:dns], {}, false) - -end diff --git a/tests/slicehost/models/dns/records_tests.rb b/tests/slicehost/models/dns/records_tests.rb deleted file mode 100644 index 73f644648..000000000 --- a/tests/slicehost/models/dns/records_tests.rb +++ /dev/null @@ -1,5 +0,0 @@ -Shindo.tests('Slicehost::DNS | records collection', ['slicehost']) do - - records_tests(Slicehost[:dns], {}, false) - -end diff --git a/tests/slicehost/models/dns/zone_tests.rb b/tests/slicehost/models/dns/zone_tests.rb deleted file mode 100644 index 3098cec4d..000000000 --- a/tests/slicehost/models/dns/zone_tests.rb +++ /dev/null @@ -1,5 +0,0 @@ -Shindo.tests('Slicehost::DNS | zone model', ['slicehost']) do - - zone_tests(Slicehost[:dns], {}, false) - -end diff --git a/tests/slicehost/models/dns/zones_tests.rb b/tests/slicehost/models/dns/zones_tests.rb deleted file mode 100644 index b3b28cf38..000000000 --- a/tests/slicehost/models/dns/zones_tests.rb +++ /dev/null @@ -1,5 +0,0 @@ -Shindo.tests('Slicehost::DNS | zones collection', ['slicehost']) do - - zones_tests(Slicehost[:dns], {}, false) - -end diff --git a/tests/zerigo/helper.rb b/tests/zerigo/helper.rb deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/zerigo/models/dns/record_tests.rb b/tests/zerigo/models/dns/record_tests.rb deleted file mode 100644 index 347e659fa..000000000 --- a/tests/zerigo/models/dns/record_tests.rb +++ /dev/null @@ -1,5 +0,0 @@ -Shindo.tests('Zerigo::DNS | record model', ['zerigo']) do - - record_tests(Zerigo[:dns], {}, false) - -end diff --git a/tests/zerigo/models/dns/records_tests.rb b/tests/zerigo/models/dns/records_tests.rb deleted file mode 100644 index 7365f8003..000000000 --- a/tests/zerigo/models/dns/records_tests.rb +++ /dev/null @@ -1,5 +0,0 @@ -Shindo.tests('Zerigo::DNS | records collection', ['zerigo']) do - - records_tests(Zerigo[:dns], {}, false) - -end diff --git a/tests/zerigo/models/dns/zone_tests.rb b/tests/zerigo/models/dns/zone_tests.rb deleted file mode 100644 index e0393c458..000000000 --- a/tests/zerigo/models/dns/zone_tests.rb +++ /dev/null @@ -1,5 +0,0 @@ -Shindo.tests('Zerigo::DNS | zone model', ['zerigo']) do - - zone_tests(Zerigo[:dns], {}, false) - -end diff --git a/tests/zerigo/models/dns/zones_tests.rb b/tests/zerigo/models/dns/zones_tests.rb deleted file mode 100644 index 33354ad7f..000000000 --- a/tests/zerigo/models/dns/zones_tests.rb +++ /dev/null @@ -1,5 +0,0 @@ -Shindo.tests('Zerigo::DNS | zones collection', ['zerigo']) do - - zones_tests(Zerigo[:dns], {}, false) - -end