test(describe): fix flaky pipeline show test (#1048)

SoManyHs · web-flow · commit 6f05c60a6a83 · 2020-06-24T23:01:47.000Z
Related: #918   By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
diff --git a/internal/pkg/describe/describe.go b/internal/pkg/describe/describe.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudformation"
+	"github.com/dustin/go-humanize"
 	"io"
 )
 
@@ -19,6 +20,9 @@ const (
 	noAdditionalFormatting = 0
 )
 
+// humanizeTime is overriden in tests so that its output is constant as time passes.
+var humanizeTime = humanize.Time
+
 // HumanJSONStringer contains methods that stringify app info for output.
 type HumanJSONStringer interface {
 	HumanString() string
diff --git a/internal/pkg/describe/pipeline_test.go b/internal/pkg/describe/pipeline_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/aws/amazon-ecs-cli-v2/internal/pkg/describe/mocks"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudformation"
+	"github.com/dustin/go-humanize"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 )
@@ -188,6 +189,14 @@ func TestPipelineDescriber_Describe(t *testing.T) {
 }
 
 func TestPipelineDescriber_String(t *testing.T) {
+	oldHumanize := humanizeTime
+	humanizeTime = func(then time.Time) string {
+		now, _ := time.Parse(time.RFC3339, "2020-06-19T00:00:00+00:00")
+		return humanize.RelTime(then, now, "ago", "from now")
+	}
+	defer func() {
+		humanizeTime = oldHumanize
+	}()
 	testCases := map[string]struct {
 		inPipeline          *Pipeline
 		expectedHumanString string
@@ -200,8 +209,8 @@ func TestPipelineDescriber_String(t *testing.T) {
   Name              pipeline-dinder-badgoose-repo
   Region            us-west-2
   AccountID         1234567890
-  Created At        3 months ago
-  Updated At        3 months ago
+  Created At        4 months ago
+  Updated At        4 months ago
 
 Stages
 
@@ -228,8 +237,8 @@ Resources
   Name              pipeline-dinder-badgoose-repo
   Region            us-west-2
   AccountID         1234567890
-  Created At        3 months ago
-  Updated At        3 months ago
+  Created At        4 months ago
+  Updated At        4 months ago
 
 Stages
 
@@ -246,7 +255,7 @@ Stages
 		human := tc.inPipeline.HumanString()
 		json, _ := tc.inPipeline.JSONString()
 
-		require.NotEmpty(t, tc.expectedHumanString, human, "expected human output to not be empty")
+		require.Equal(t, tc.expectedHumanString, human, "expected human output to match")
 		require.Equal(t, tc.expectedJSONString, json, "expected JSON output to match")
 	}
 }
diff --git a/internal/pkg/describe/status.go b/internal/pkg/describe/status.go
@@ -16,12 +16,8 @@ import (
 	"github.com/aws/amazon-ecs-cli-v2/internal/pkg/config"
 	"github.com/aws/amazon-ecs-cli-v2/internal/pkg/deploy/cloudformation/stack"
 	"github.com/aws/amazon-ecs-cli-v2/internal/pkg/term/color"
-	"github.com/dustin/go-humanize"
 )
 
-// humanizeTime is overriden in tests so that its output is constant as time passes.
-var humanizeTime = humanize.Time
-
 type alarmStatusGetter interface {
 	GetAlarmsWithTags(tags map[string]string) ([]cloudwatch.AlarmStatus, error)
 }

Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,8 @@ import (`
`16`	`16`	`"github.com/aws/amazon-ecs-cli-v2/internal/pkg/config"`
`17`	`17`	`"github.com/aws/amazon-ecs-cli-v2/internal/pkg/deploy/cloudformation/stack"`
`18`	`18`	`"github.com/aws/amazon-ecs-cli-v2/internal/pkg/term/color"`
`19`		`- "github.com/dustin/go-humanize"`
`20`	`19`	`)`
`21`	`20`
`22`		`-// humanizeTime is overriden in tests so that its output is constant as time passes.`
`23`		`-var humanizeTime = humanize.Time`
`24`		`-`
`25`	`21`	`type alarmStatusGetter interface {`
`26`	`22`	`GetAlarmsWithTags(tags map[string]string) ([]cloudwatch.AlarmStatus, error)`
`27`	`23`	`}`