diff options
| author | Dave Henderson <dhenderson@gmail.com> | 2016-09-01 22:51:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-01 22:51:38 -0400 |
| commit | 1fb1dbb55fa635fb09d91c92f44c22b3f6336c52 (patch) | |
| tree | ba9a5c6a855c836d131f3e48c31301a9e0f2f3b0 /aws | |
| parent | b3f199916089b52c306882b3b3a779c5721179d8 (diff) | |
| parent | 6184ae548b5319dfe113735ec9d421864d7f7ae4 (diff) | |
Merge pull request #57 from hairyhenderson/fix-tests
Fixing broken tests
Diffstat (limited to 'aws')
| -rw-r--r-- | aws/ec2info_test.go | 14 |
1 files changed, 9 insertions, 5 deletions
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{ |