kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

merge tags if present, reset mocks after acl/vpc tests

Browse source
This commit is contained in:
Ben House 2014-07-11 21:44:48 -07:00
parent 3e1e814eb6
commit c8ae8dca18
4 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/fog/aws/requests/compute/describe_network_acls.rb
View file

@ -92,7 +92,8 @@ module Fog
end
network_acls.each do |acl|
acl.merge!('tagSet' => self.data[:tag_sets][acl['networkAclId']])
tags = self.data[:tag_sets][acl['networkAclId']]
acl.merge!('tagSet' => tags) if tags
end
response.status = 200

3
lib/fog/aws/requests/compute/describe_vpcs.rb
View file

@ -56,7 +56,8 @@ module Fog
end
vpcs.each do |vpc|
vpc.merge!('tagSet' => self.data[:tag_sets][vpc['vpcId']])
tags = self.data[:tag_sets][vpc['vpcId']]
vpc.merge!('tagSet' => tags) if tags
end
Excon::Response.new(

1
tests/aws/requests/compute/network_acl_tests.rb
View file

@ -107,5 +107,6 @@ Shindo.tests('Fog::Compute[:aws] | network acl requests', ['aws']) do
@another_acl.destroy
@subnet.destroy
@vpc.destroy
Fog::Compute::AWS::Mock.reset if Fog.mocking?
end
end

1
tests/aws/requests/compute/vpc_tests.rb
View file

@ -106,5 +106,6 @@ Shindo.tests('Fog::Compute[:aws] | vpc requests', ['aws']) do
# Clean up
Fog::Compute[:aws].delete_tags(@another_vpc.id, test_tags)
@another_vpc.destroy
Fog::Compute::AWS::Mock.reset if Fog.mocking?
end
end