From 5e7ec643473b5db7c6336d200f9cd844e277ea86 Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Sat, 5 Sep 2020 18:28:21 +0200 Subject: [PATCH] Move abs resolution a bit earlier to make it clear where we are looking for golden output --- pkg/testutils/golden/compare.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/testutils/golden/compare.go b/pkg/testutils/golden/compare.go index 3d71f5ad6c..9efdbcede4 100644 --- a/pkg/testutils/golden/compare.go +++ b/pkg/testutils/golden/compare.go @@ -33,6 +33,13 @@ import ( func AssertMatchesFile(t *testing.T, actual string, p string) { actual = strings.TrimSpace(actual) + abs, err := filepath.Abs(p) + if err != nil { + t.Errorf("unable to get absolute path for %q: %v", p, err) + } else { + p = abs + } + expectedBytes, err := ioutil.ReadFile(p) if err != nil { if !os.IsNotExist(err) || os.Getenv("HACK_UPDATE_EXPECTED_IN_PLACE") == "" { @@ -69,13 +76,6 @@ func AssertMatchesFile(t *testing.T, actual string, p string) { diffString := diff.FormatDiff(expected, actual) t.Logf("diff:\n%s\n", diffString) - abs, err := filepath.Abs(p) - if err != nil { - t.Errorf("unable to get absolute path for %q: %v", p, err) - } else { - p = abs - } - t.Logf("to update golden output automatically, run hack/update-expected.sh") t.Errorf("output did not match expected for %q", p)