From 670d53b1a1f783765329e2986080184966673e77 Mon Sep 17 00:00:00 2001 From: Clint Shryock Date: Wed, 11 Mar 2015 16:21:22 -0500 Subject: [PATCH] upgrade tests and remove ICMPTypeCode for now --- builtin/providers/aws/network_acl_entry_test.go | 12 ++---------- builtin/providers/aws/structure_test.go | 3 --- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/builtin/providers/aws/network_acl_entry_test.go b/builtin/providers/aws/network_acl_entry_test.go index dbbca1e87..50f6fdc85 100644 --- a/builtin/providers/aws/network_acl_entry_test.go +++ b/builtin/providers/aws/network_acl_entry_test.go @@ -31,7 +31,7 @@ func Test_expandNetworkACLEntry(t *testing.T) { expected := []ec2.NetworkACLEntry{ ec2.NetworkACLEntry{ - Protocol: aws.String("tcp"), + Protocol: aws.String("6"), PortRange: &ec2.PortRange{ From: aws.Integer(22), To: aws.Integer(22), @@ -40,13 +40,9 @@ func Test_expandNetworkACLEntry(t *testing.T) { RuleNumber: aws.Integer(1), CIDRBlock: aws.String("0.0.0.0/0"), Egress: aws.Boolean(true), - ICMPTypeCode: &ec2.ICMPTypeCode{ - Code: aws.Integer(0), - Type: aws.Integer(0), - }, }, ec2.NetworkACLEntry{ - Protocol: aws.String("tcp"), + Protocol: aws.String("6"), PortRange: &ec2.PortRange{ From: aws.Integer(443), To: aws.Integer(443), @@ -55,10 +51,6 @@ func Test_expandNetworkACLEntry(t *testing.T) { RuleNumber: aws.Integer(2), CIDRBlock: aws.String("0.0.0.0/0"), Egress: aws.Boolean(true), - ICMPTypeCode: &ec2.ICMPTypeCode{ - Code: aws.Integer(0), - Type: aws.Integer(0), - }, }, } diff --git a/builtin/providers/aws/structure_test.go b/builtin/providers/aws/structure_test.go index fdee02585..d5e470341 100644 --- a/builtin/providers/aws/structure_test.go +++ b/builtin/providers/aws/structure_test.go @@ -1,7 +1,6 @@ package aws import ( - "log" "reflect" "testing" @@ -62,8 +61,6 @@ func TestExpandIPPerms(t *testing.T) { } perms := expandIPPerms("foo", expanded) - log.Printf("wtf is perms:\n%#v", perms) - expected := []awsEC2.IPPermission{ awsEC2.IPPermission{ IPProtocol: aws.String("icmp"),