remote: guard against symlinks in earlier path components

[safcm/safcm.git] / testutil / testutil.go

diff --git a/testutil/testutil.go b/testutil/testutil.go
index 8d2e86b1521a345cf45afb365fc470eed776674e..1722fd5242132fd463ad856fa7078789d150d3c7 100644 (file)
--- a/testutil/testutil.go
+++ b/testutil/testutil.go
@@ -26,15 +26,19 @@ import (
 )
 
 func AssertEqual(t *testing.T, name string, act, exp interface{}) {
+       t.Helper()
+
        if !reflect.DeepEqual(act, exp) {
                t.Errorf("%s: %s", name, cmp.Diff(exp, act))
        }
 }
 
 func AssertErrorEqual(t *testing.T, name string, act, exp error) {
+       t.Helper()
+
        // Ugly but the simplest way to compare errors (including nil)
-       actStr := fmt.Sprintf("%s", act)
-       expStr := fmt.Sprintf("%s", exp)
+       actStr := fmt.Sprintf("%v", act)
+       expStr := fmt.Sprintf("%v", exp)
        if actStr != expStr {
                t.Errorf("err = %s (%#v), want %s (%#v)",
                        actStr, act, expStr, exp)