From 395886ab9482a7c08fd25559e7b6efff5956fbf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Stemmer?= Date: Sun, 22 May 2022 20:41:00 +0100 Subject: [PATCH] Revert "internal: make timestampFunc private" This reverts commit dcbbd9fb228a8ac978f04dbb1d66570942bd24ba and fixes testdata/generate-golden-reports.go. --- internal/gojunitreport/go-junit-report.go | 6 ++---- internal/gojunitreport/go-junit-report_test.go | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/internal/gojunitreport/go-junit-report.go b/internal/gojunitreport/go-junit-report.go index 748b138..528fbb8 100644 --- a/internal/gojunitreport/go-junit-report.go +++ b/internal/gojunitreport/go-junit-report.go @@ -26,12 +26,10 @@ type Config struct { SkipXMLHeader bool SubtestMode gotest.SubtestMode Properties map[string]string + TimestampFunc func() time.Time // For debugging PrintEvents bool - - // For testing - timestampFunc func() time.Time } // Run runs the go-junit-report command and returns the generated report. @@ -98,6 +96,6 @@ func (c Config) gotestOptions() []gotest.Option { return []gotest.Option{ gotest.PackageName(c.PackageName), gotest.SetSubtestMode(c.SubtestMode), - gotest.TimestampFunc(c.timestampFunc), + gotest.TimestampFunc(c.TimestampFunc), } } diff --git a/internal/gojunitreport/go-junit-report_test.go b/internal/gojunitreport/go-junit-report_test.go index 45ef28f..97db517 100644 --- a/internal/gojunitreport/go-junit-report_test.go +++ b/internal/gojunitreport/go-junit-report_test.go @@ -70,7 +70,7 @@ func testRun(inputFile, reportFile string, config Config, t *testing.T) { } config.Hostname = "hostname" config.Properties = map[string]string{"go.version": "1.0"} - config.timestampFunc = func() time.Time { + config.TimestampFunc = func() time.Time { return time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC) }