From ef9fae38d6080bb5e1a07c65563711b5f364ce4c Mon Sep 17 00:00:00 2001 From: Brian Hartsock Date: Thu, 10 Nov 2011 19:34:04 -0500 Subject: [PATCH] [rackspace|dns] Fixed request tests that need unique domain name --- tests/rackspace/requests/dns/dns_tests.rb | 28 +++++++++++-------- tests/rackspace/requests/dns/records_tests.rb | 24 ++++++++-------- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/tests/rackspace/requests/dns/dns_tests.rb b/tests/rackspace/requests/dns/dns_tests.rb index 2eb338e28..0547f7f0c 100644 --- a/tests/rackspace/requests/dns/dns_tests.rb +++ b/tests/rackspace/requests/dns/dns_tests.rb @@ -1,9 +1,10 @@ Shindo.tests('Fog::DNS[:rackspace] | DNS requests', ['rackspace', 'dns']) do pending if Fog.mocking? + domain_name = uniq_id + '.com' tests('success on simple domain') do - domain_tests(Fog::DNS[:rackspace], {:name => 'basictestdomain.com', :email => 'hostmaster@basictestdomain.com', :records => [{:ttl => 300, :name => 'basictestdomain.com', :type => 'A', :data => '192.168.1.1'}]}) do + domain_tests(Fog::DNS[:rackspace], {:name => domain_name, :email => 'hostmaster@' + domain_name, :records => [{:ttl => 300, :name => domain_name, :type => 'A', :data => '192.168.1.1'}]}) do tests('list_domains').formats(LIST_DOMAIN_FORMAT.reject {|key,value| key == 'links'}) do Fog::DNS[:rackspace].list_domains.body @@ -27,21 +28,21 @@ Shindo.tests('Fog::DNS[:rackspace] | DNS requests', ['rackspace', 'dns']) do tests('success for domain with multiple records') do domain_tests(Fog::DNS[:rackspace], { - :name => 'testdomainwithmultiplerecords.com', - :email => 'hostmaster@testdomainwithmultiplerecords.com', + :name => domain_name, + :email => 'hostmaster@' + domain_name, :records => [ { :ttl => 300, - :name => 'testdomainwithmultiplerecords.com', + :name => domain_name, :type => 'A', :data => '192.168.1.1' }, { :ttl => 3600, - :name => 'testdomainwithmultiplerecords.com', + :name => domain_name, :type => 'MX', - :data => 'mx.testdomainwithmultiplerecords.com', + :data => 'mx.' + domain_name, :priority => 10 } ] @@ -49,21 +50,24 @@ Shindo.tests('Fog::DNS[:rackspace] | DNS requests', ['rackspace', 'dns']) do end tests('success for multiple domains') do + domain1_name = uniq_id + '-1.com' + domain2_name = uniq_id + '-2.com' + domains_tests(Fog::DNS[:rackspace], [ - {:name => 'basictestdomain1.com', :email => 'hostmaster@basictestdomain1.com', :records => [{:ttl => 300, :name =>'basictestdomain1.com', :type => 'A', :data => '192.168.1.1'}]}, - {:name => 'basictestdomain2.com', :email => 'hostmaster@basictestdomain2.com', :records => [{:ttl => 300, :name =>'basictestdomain2.com', :type => 'A', :data => '192.168.1.1'}]} + {:name => domain1_name, :email => 'hostmaster@' + domain1_name, :records => [{:ttl => 300, :name => domain1_name, :type => 'A', :data => '192.168.1.1'}]}, + {:name => domain2_name, :email => 'hostmaster@' + domain2_name, :records => [{:ttl => 300, :name => domain2_name, :type => 'A', :data => '192.168.1.1'}]} ]) end tests('success for domain with subdomain') do domains_tests(Fog::DNS[:rackspace], [ - {:name => 'basictestdomain.com', :email => 'hostmaster@basictestdomain.com', :records => [{:ttl => 300, :name =>'basictestdomain.com', :type => 'A', :data => '192.168.1.1'}]}, - {:name => 'subdomain.basictestdomain.com', :email => 'hostmaster@subdomain.basictestdomain.com', :records => [{:ttl => 300, :name =>'subdomain.basictestdomain.com', :type => 'A', :data => '192.168.1.1'}]} + {:name => domain_name, :email => 'hostmaster@' + domain_name, :records => [{:ttl => 300, :name => domain_name, :type => 'A', :data => '192.168.1.1'}]}, + {:name => 'subdomain.' + domain_name, :email => 'hostmaster@subdomain.' + domain_name, :records => [{:ttl => 300, :name =>'subdomain.' + domain_name, :type => 'A', :data => '192.168.1.1'}]} ], true) do - @root_domain_id = @domain_details.find { |domain| domain['name'] == 'basictestdomain.com' }['id'] + @root_domain_id = @domain_details.find { |domain| domain['name'] == domain_name }['id'] tests("list_domain_details('#{@root_domain_id}', :show_records => false, :show_subdomains => false)") do response = Fog::DNS[:rackspace].list_domain_details(@root_domain_id, :show_records => false, :show_subdomains => false) @@ -89,7 +93,7 @@ Shindo.tests('Fog::DNS[:rackspace] | DNS requests', ['rackspace', 'dns']) do wait_for Fog::DNS[:rackspace], Fog::DNS[:rackspace].remove_domain(@root_domain_id, :delete_subdomains => true) test('domain and subdomains were really deleted') do - (Fog::DNS[:rackspace].list_domains.body['domains'].collect { |domain| domain['name'] } & ['basictestdomain.com', 'subdomain.basictestdomain.com']).empty? + (Fog::DNS[:rackspace].list_domains.body['domains'].collect { |domain| domain['name'] } & [domain_name, 'subdomain.' + domain_name]).empty? end end end diff --git a/tests/rackspace/requests/dns/records_tests.rb b/tests/rackspace/requests/dns/records_tests.rb index 386a4fc99..fffa5c34f 100644 --- a/tests/rackspace/requests/dns/records_tests.rb +++ b/tests/rackspace/requests/dns/records_tests.rb @@ -2,7 +2,9 @@ Shindo.tests('Fog::DNS[:rackspace] | dns records requests', ['rackspace', 'dns'] pending if Fog.mocking? - domain_tests(Fog::DNS[:rackspace], {:name => 'basictestdomain.com', :email => 'hostmaster@basictestdomain.com', :records => [{:ttl => 300, :name => 'basictestdomain.com', :type => 'A', :data => '192.168.1.1'}]}) do + domain_name = uniq_id + '.com' + + domain_tests(Fog::DNS[:rackspace], {:name => domain_name, :email => 'hostmaster@' + domain_name, :records => [{:ttl => 300, :name => domain_name, :type => 'A', :data => '192.168.1.1'}]}) do tests('success on single record') do @@ -10,18 +12,18 @@ Shindo.tests('Fog::DNS[:rackspace] | dns records requests', ['rackspace', 'dns'] Fog::DNS[:rackspace].list_records(@domain_id).body end - tests("add_records(#{@domain_id}, [{ :name => 'test1.basictestdomain.com', :type => 'A', :data => '192.168.2.1'}])").formats(RECORD_LIST_FORMAT) do - response = wait_for Fog::DNS[:rackspace], Fog::DNS[:rackspace].add_records(@domain_id, [{ :name => 'test1.basictestdomain.com', :type => 'A', :data => '192.168.2.1'}]) - @record_id = response.body['records'].first['id'] - response.body + tests("add_records(#{@domain_id}, [{ :name => 'test1.#{domain_name}', :type => 'A', :data => '192.168.2.1'}])").formats(RECORD_LIST_FORMAT) do + response = wait_for Fog::DNS[:rackspace], Fog::DNS[:rackspace].add_records(@domain_id, [{ :name => 'test1.' + domain_name, :type => 'A', :data => '192.168.2.1'}]) + @record_id = response.body['response']['records'].first['id'] + response.body['response'] end tests("list_record_details(#{@domain_id}, #{@record_id})").formats(RECORD_FORMAT) do Fog::DNS[:rackspace].list_record_details(@domain_id, @record_id).body end - tests("modify_record(#{@domain_id}, #{@record_id}, { :ttl => 500, :name => 'test2.basictestdomain.com', :data => '192.168.3.1' })").succeeds do - wait_for Fog::DNS[:rackspace], Fog::DNS[:rackspace].modify_record(@domain_id, @record_id, { :ttl => 500, :name => 'test2.basictestdomain.com', :data => '192.168.3.1' }) + tests("modify_record(#{@domain_id}, #{@record_id}, { :ttl => 500, :name => 'test2.#{domain_name}', :data => '192.168.3.1' })").succeeds do + wait_for Fog::DNS[:rackspace], Fog::DNS[:rackspace].modify_record(@domain_id, @record_id, { :ttl => 500, :name => 'test2.' + domain_name, :data => '192.168.3.1' }) end tests("remove_record(#{@domain_id}, #{@record_id})").succeeds do @@ -33,14 +35,14 @@ Shindo.tests('Fog::DNS[:rackspace] | dns records requests', ['rackspace', 'dns'] records_attributes = [ - { :name => 'test1.basictestdomain.com', :type => 'A', :data => '192.168.2.1'}, - { :name => 'basictestdomain.com', :type => 'MX', :priority => 10, :data => 'mx.basictestdomain.com'} + { :name => 'test1.' + domain_name, :type => 'A', :data => '192.168.2.1'}, + { :name => domain_name, :type => 'MX', :priority => 10, :data => 'mx.' + domain_name} ] tests("add_records(#{@domain_id}, #{records_attributes})").formats(RECORD_LIST_FORMAT) do response = wait_for Fog::DNS[:rackspace], Fog::DNS[:rackspace].add_records(@domain_id, records_attributes) - @record_ids = response.body['records'].collect { |record| record['id'] } - response.body + @record_ids = response.body['response']['records'].collect { |record| record['id'] } + response.body['response'] end tests("remove_records(#{@domain_id}, #{@record_ids})").succeeds do