From 6184ae548b5319dfe113735ec9d421864d7f7ae4 Mon Sep 17 00:00:00 2001 From: Dave Henderson Date: Thu, 1 Sep 2016 22:49:21 -0400 Subject: Fixing broken tests Signed-off-by: Dave Henderson --- aws/ec2info_test.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'aws') diff --git a/aws/ec2info_test.go b/aws/ec2info_test.go index aafcb6b6..1fcc7b4a 100644 --- a/aws/ec2info_test.go +++ b/aws/ec2info_test.go @@ -11,7 +11,7 @@ import ( func TestTag_MissingKey(t *testing.T) { server, ec2meta := MockServer(200, `"i-1234"`) defer server.Close() - client := &DummyInstanceDescriber{ + client := DummyInstanceDescriber{ tags: []*ec2.Tag{ &ec2.Tag{ Key: aws.String("foo"), @@ -24,7 +24,9 @@ func TestTag_MissingKey(t *testing.T) { }, } e := &Ec2Info{ - describer: client, + describer: func() InstanceDescriber { + return client + }, metaClient: ec2meta, } @@ -35,7 +37,7 @@ func TestTag_MissingKey(t *testing.T) { func TestTag_ValidKey(t *testing.T) { server, ec2meta := MockServer(200, `"i-1234"`) defer server.Close() - client := &DummyInstanceDescriber{ + client := DummyInstanceDescriber{ tags: []*ec2.Tag{ &ec2.Tag{ Key: aws.String("foo"), @@ -48,7 +50,9 @@ func TestTag_ValidKey(t *testing.T) { }, } e := &Ec2Info{ - describer: client, + describer: func() InstanceDescriber { + return client + }, metaClient: ec2meta, } @@ -61,7 +65,7 @@ type DummyInstanceDescriber struct { tags []*ec2.Tag } -func (d *DummyInstanceDescriber) DescribeInstances(*ec2.DescribeInstancesInput) (*ec2.DescribeInstancesOutput, error) { +func (d DummyInstanceDescriber) DescribeInstances(*ec2.DescribeInstancesInput) (*ec2.DescribeInstancesOutput, error) { output := &ec2.DescribeInstancesOutput{ Reservations: []*ec2.Reservation{ &ec2.Reservation{ -- cgit v1.2.3