epoch: fix unit test when SOURCE_DATE_EPOCH is set

samuelkarp · samuelkarp · commit 8ce3e4e159ff · 2023-03-03T15:12:22.000-08:00
Fixes #8200 Signed-off-by: Samuel Karp <samuelkarp@google.com>
diff --git a/pkg/epoch/epoch.go b/pkg/epoch/epoch.go
@@ -34,7 +34,7 @@ const SourceDateEpochEnv = "SOURCE_DATE_EPOCH"
 // If the env var is not set, SourceDateEpoch returns nil without an error.
 func SourceDateEpoch() (*time.Time, error) {
 	v, ok := os.LookupEnv(SourceDateEpochEnv)
-	if !ok {
+	if !ok || v == "" {
 		return nil, nil // not an error
 	}
 	i64, err := strconv.ParseInt(v, 10, 64)
diff --git a/pkg/epoch/epoch_test.go b/pkg/epoch/epoch_test.go
@@ -36,7 +36,9 @@ func rightAfter(t1, t2 time.Time) bool {
 func TestSourceDateEpoch(t *testing.T) {
 	if s, ok := os.LookupEnv(SourceDateEpochEnv); ok {
 		t.Logf("%s is already set to %q, unsetting", SourceDateEpochEnv, s)
+		// see https://github.com/golang/go/issues/52817#issuecomment-1131339120
 		t.Setenv(SourceDateEpochEnv, "")
+		os.Unsetenv(SourceDateEpochEnv)
 	}
 
 	t.Run("WithoutSourceDateEpoch", func(t *testing.T) {
@@ -49,6 +51,18 @@ func TestSourceDateEpoch(t *testing.T) {
 		require.True(t, rightAfter(now, v))
 	})
 
+	t.Run("WithEmptySourceDateEpoch", func(t *testing.T) {
+		t.Setenv(SourceDateEpochEnv, "")
+
+		vp, err := SourceDateEpoch()
+		require.NoError(t, err)
+		require.Nil(t, vp)
+
+		now := time.Now()
+		v := SourceDateEpochOrNow()
+		require.True(t, rightAfter(now, v))
+	})
+
 	t.Run("WithSourceDateEpoch", func(t *testing.T) {
 		sourceDateEpoch, err := time.Parse(time.RFC3339, "2022-01-23T12:34:56Z")
 		require.NoError(t, err)

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ const SourceDateEpochEnv = "SOURCE_DATE_EPOCH"`
`34`	`34`	`// If the env var is not set, SourceDateEpoch returns nil without an error.`
`35`	`35`	`func SourceDateEpoch() (*time.Time, error) {`
`36`	`36`	`v, ok := os.LookupEnv(SourceDateEpochEnv)`
`37`		`- if !ok {`
	`37`	`+ if !ok \|\| v == "" {`
`38`	`38`	`return nil, nil // not an error`
`39`	`39`	`}`
`40`	`40`	`i64, err := strconv.ParseInt(v, 10, 64)`