From c5151fb7b3814b77db4af68bb50aafaf2e14ee94 Mon Sep 17 00:00:00 2001 From: Adam Reese Date: Thu, 19 Apr 2018 11:10:20 -0700 Subject: [PATCH] ref(*): cleanup timestamps in tests --- cmd/helm/status_test.go | 18 ++++++++---------- pkg/releasetesting/test_suite_test.go | 5 ++--- pkg/tiller/release_server_test.go | 14 +++++--------- 3 files changed, 15 insertions(+), 22 deletions(-) diff --git a/cmd/helm/status_test.go b/cmd/helm/status_test.go index 649cd8f0d..d503c8626 100644 --- a/cmd/helm/status_test.go +++ b/cmd/helm/status_test.go @@ -28,8 +28,6 @@ import ( "k8s.io/helm/pkg/helm" ) -var date = time.Unix(242085845, 0) - func TestStatusCmd(t *testing.T) { tests := []releaseCase{ { @@ -100,21 +98,21 @@ func TestStatusCmd(t *testing.T) { releaseMockWithStatus(&release.Status{ Code: release.Status_DEPLOYED, LastTestSuiteRun: &release.TestSuite{ - StartedAt: date, - CompletedAt: date, + StartedAt: time.Now(), + CompletedAt: time.Now(), Results: []*release.TestRun{ { Name: "test run 1", Status: release.TestRun_SUCCESS, Info: "extra info", - StartedAt: date, - CompletedAt: date, + StartedAt: time.Now(), + CompletedAt: time.Now(), }, { Name: "test run 2", Status: release.TestRun_FAILURE, - StartedAt: date, - CompletedAt: date, + StartedAt: time.Now(), + CompletedAt: time.Now(), }, }, }, @@ -137,8 +135,8 @@ func releaseMockWithStatus(status *release.Status) *release.Release { return &release.Release{ Name: "flummoxed-chickadee", Info: &release.Info{ - FirstDeployed: date, - LastDeployed: date, + FirstDeployed: time.Now(), + LastDeployed: time.Now(), Status: status, }, } diff --git a/pkg/releasetesting/test_suite_test.go b/pkg/releasetesting/test_suite_test.go index ada69ba13..568493858 100644 --- a/pkg/releasetesting/test_suite_test.go +++ b/pkg/releasetesting/test_suite_test.go @@ -225,12 +225,11 @@ func chartStub() *chart.Chart { } func releaseStub() *release.Release { - date := time.Unix(242085845, 0) return &release.Release{ Name: "lost-fish", Info: &release.Info{ - FirstDeployed: date, - LastDeployed: date, + FirstDeployed: time.Now(), + LastDeployed: time.Now(), Status: &release.Status{Code: release.Status_DEPLOYED}, Description: "a release stub", }, diff --git a/pkg/tiller/release_server_test.go b/pkg/tiller/release_server_test.go index 916f2a005..00982aaf8 100644 --- a/pkg/tiller/release_server_test.go +++ b/pkg/tiller/release_server_test.go @@ -222,12 +222,11 @@ func releaseStub() *release.Release { } func namedReleaseStub(name string, status release.StatusCode) *release.Release { - date := time.Unix(242085845, 0) return &release.Release{ Name: name, Info: &release.Info{ - FirstDeployed: date, - LastDeployed: date, + FirstDeployed: time.Now(), + LastDeployed: time.Now(), Status: &release.Status{Code: status}, Description: "Named Release Stub", }, @@ -259,14 +258,12 @@ func namedReleaseStub(name string, status release.StatusCode) *release.Release { } func upgradeReleaseVersion(rel *release.Release) *release.Release { - date := time.Unix(242085845, 0) - rel.Info.Status.Code = release.Status_SUPERSEDED return &release.Release{ Name: rel.Name, Info: &release.Info{ FirstDeployed: rel.Info.FirstDeployed, - LastDeployed: date, + LastDeployed: time.Now(), Status: &release.Status{Code: release.Status_DEPLOYED}, }, Chart: rel.Chart, @@ -366,12 +363,11 @@ func releaseWithKeepStub(rlsName string) *release.Release { }, } - date := time.Unix(242085845, 0) return &release.Release{ Name: rlsName, Info: &release.Info{ - FirstDeployed: date, - LastDeployed: date, + FirstDeployed: time.Now(), + LastDeployed: time.Now(), Status: &release.Status{Code: release.Status_DEPLOYED}, }, Chart: ch,