From 85cebef1cb7cd3701e523ed13a111da79761e214 Mon Sep 17 00:00:00 2001 From: Brian Hartsock Date: Thu, 10 Nov 2011 20:56:32 -0500 Subject: [PATCH] [dns] Made model tests use uniq domain names --- tests/dns/models/record_tests.rb | 6 ++++-- tests/dns/models/records_tests.rb | 6 ++++-- tests/dns/models/zone_tests.rb | 4 +++- tests/dns/models/zones_tests.rb | 6 ++++-- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/tests/dns/models/record_tests.rb b/tests/dns/models/record_tests.rb index 791a3db1e..5bac71122 100644 --- a/tests/dns/models/record_tests.rb +++ b/tests/dns/models/record_tests.rb @@ -3,17 +3,19 @@ for provider, config in dns_providers # FIXME: delay/timing breaks things :( next if [:dnsmadeeasy].include?(provider) + domain_name = uniq_id + '.com' + Shindo.tests("Fog::DNS[:#{provider}] | record", [provider.to_s]) do record_attributes = { - :name => 'www.fogrecordtests.com', + :name => 'www.' + domain_name, :type => 'A', :value => '1.2.3.4' }.merge!(config[:record_attributes] || {}) if !Fog.mocking? || config[:mocked] zone_attributes = { - :domain => 'fogrecordtests.com' + :domain => domain_name }.merge(config[:zone_attributes] || {}) @zone = Fog::DNS[provider].zones.create(zone_attributes) diff --git a/tests/dns/models/records_tests.rb b/tests/dns/models/records_tests.rb index a44e192f1..49e0bb49c 100644 --- a/tests/dns/models/records_tests.rb +++ b/tests/dns/models/records_tests.rb @@ -3,17 +3,19 @@ for provider, config in dns_providers # FIXME: delay/timing breaks things :( next if [:dnsmadeeasy].include?(provider) + domain_name = uniq_id + '.com' + Shindo.tests("Fog::DNS[:#{provider}] | records", [provider.to_s]) do record_attributes = { - :name => 'www.fogrecordstests.com', + :name => 'www.' + domain_name, :type => 'A', :value => '1.2.3.4' }.merge!(config[:record_attributes] || {}) if !Fog.mocking? || config[:mocked] zone_attributes = { - :domain => 'fogrecordstests.com' + :domain => domain_name }.merge(config[:zone_attributes] || {}) @zone = Fog::DNS[provider].zones.create(zone_attributes) diff --git a/tests/dns/models/zone_tests.rb b/tests/dns/models/zone_tests.rb index 364b24368..3aa7efab3 100644 --- a/tests/dns/models/zone_tests.rb +++ b/tests/dns/models/zone_tests.rb @@ -3,10 +3,12 @@ for provider, config in dns_providers # FIXME: delay/timing breaks things :( next if [:dnsmadeeasy].include?(provider) + domain_name = uniq_id + '.com' + Shindo.tests("Fog::DNS[:#{provider}] | zone", [provider.to_s]) do zone_attributes = { - :domain => 'fogzonetests.com' + :domain => domain_name }.merge!(config[:zone_attributes] || {}) model_tests(Fog::DNS[provider].zones, zone_attributes, config[:mocked]) diff --git a/tests/dns/models/zones_tests.rb b/tests/dns/models/zones_tests.rb index 867403e6b..5bf8cd547 100644 --- a/tests/dns/models/zones_tests.rb +++ b/tests/dns/models/zones_tests.rb @@ -3,14 +3,16 @@ for provider, config in dns_providers # FIXME: delay/timing breaks things :( next if [:dnsmadeeasy].include?(provider) + domain_name = uniq_id + '.com' + Shindo.tests("Fog::DNS[:#{provider}] | zones", [provider.to_s]) do zone_attributes = { - :domain => 'fogzonestests.com' + :domain => domain_name }.merge!(config[:zone_attributes] || {}) collection_tests(Fog::DNS[provider].zones, zone_attributes, config[:mocked]) end -end \ No newline at end of file +end