From 0a6b7a9301fcd244df2fce11c12355a179f20fdf Mon Sep 17 00:00:00 2001 From: Jack Pearkes Date: Mon, 14 Jul 2014 18:57:04 -0400 Subject: [PATCH] providers/aws: more elb test fixes --- builtin/providers/aws/resource_aws_elb_test.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/builtin/providers/aws/resource_aws_elb_test.go b/builtin/providers/aws/resource_aws_elb_test.go index 0738823af..cb290c084 100644 --- a/builtin/providers/aws/resource_aws_elb_test.go +++ b/builtin/providers/aws/resource_aws_elb_test.go @@ -68,7 +68,7 @@ func testAccCheckAWSELBAttributes(conf *elb.LoadBalancer) resource.TestCheckFunc return fmt.Errorf("bad availability_zones") } - if conf.LoadBalancerName == "foobar-terraform-test" { + if conf.LoadBalancerName != "foobar-terraform-test" { return fmt.Errorf("bad name") } @@ -78,6 +78,7 @@ func testAccCheckAWSELBAttributes(conf *elb.LoadBalancer) resource.TestCheckFunc LoadBalancerPort: 80, Protocol: "http", } + if !reflect.DeepEqual(conf.Listeners[0], l) { return fmt.Errorf("bad listener") } @@ -127,11 +128,13 @@ resource "aws_elb" "bar" { name = "foobar-terraform-test" availability_zones = ["us-east-1a"] - listener = { + listener { instance_port = 8000 instance_protocol = "http" lb_port = 80 lb_protocol = "http" } + + instances = [] } `