Fix test failures.

Signed-off-by: Krzysztof Wilczynski <[email protected]>
hashicorp · Aug 1, 2016 · 4648a97 · 4648a97
1 parent 6d927a4
commit 4648a97
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/builtin/providers/aws/resource_aws_vpn_gateway_attachment.go b/builtin/providers/aws/resource_aws_vpn_gateway_attachment.go
@@ -66,7 +66,7 @@ func resourceAwsVpnGatewayAttachmentCreate(d *schema.ResourceData, meta interfac
 
 	_, err = stateConf.WaitForState()
 	if err != nil {
-		fmt.Errorf("Error waiting for VPN Gateway %q to attach to VPC %q: %s",
+		return fmt.Errorf("Error waiting for VPN Gateway %q to attach to VPC %q: %s",
 			vgwId, vpcId, err)
 	}
 	log.Printf("[DEBUG] VPN Gateway %q attached to VPC %q.", vgwId, vpcId)
@@ -157,7 +157,7 @@ func resourceAwsVpnGatewayAttachmentDelete(d *schema.ResourceData, meta interfac
 
 	_, err = stateConf.WaitForState()
 	if err != nil {
-		fmt.Errorf("Error waiting for VPN Gateway %q to detach from VPC %q: %s",
+		return fmt.Errorf("Error waiting for VPN Gateway %q to detach from VPC %q: %s",
 			vgwId, vpcId, err)
 	}
 	log.Printf("[DEBUG] VPN Gateway %q detached from VPC %q.", vgwId, vpcId)

diff --git a/builtin/providers/aws/resource_aws_vpn_gateway_attachment_test.go b/builtin/providers/aws/resource_aws_vpn_gateway_attachment_test.go
@@ -134,7 +134,7 @@ func testAccCheckVpnGatewayAttachmentDestroy(s *terraform.State) error {
 		vgw := resp.VpnGateways[0]
 		if *vgw.VpcAttachments[0].State != "detached" {
 			return fmt.Errorf("Expected VPN Gateway %q to be in detached state, but got: %q",
-				*vgw.VpcAttachments[0].State)
+				vgwId, *vgw.VpcAttachments[0].State)
 		}
 	}