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

lib/fog/aws/requests/compute/describe_network_acls.rb

@@ -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

lib/fog/aws/requests/compute/describe_vpcs.rb

@@ -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(

tests/aws/requests/compute/network_acl_tests.rb

@@ -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

tests/aws/requests/compute/vpc_tests.rb

@@ -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