diff --git a/gcsweb/cmd/gcsweb/gcsweb_test.go b/gcsweb/cmd/gcsweb/gcsweb_test.go index be283fcc0fb7..cb31c6a8a4bf 100644 --- a/gcsweb/cmd/gcsweb/gcsweb_test.go +++ b/gcsweb/cmd/gcsweb/gcsweb_test.go @@ -648,7 +648,7 @@ func TestGetParent(t *testing.T) { t.Run(tc.id, func(t *testing.T) { actual := getParent(tc.path) if !reflect.DeepEqual(tc.expected, actual) { - t.Fatalf(cmp.Diff(tc.expected, actual)) + t.Fatal(cmp.Diff(tc.expected, actual)) } }) } diff --git a/kubetest/aksengine.go b/kubetest/aksengine.go index 99e1e9f1c146..a111e3f69ff8 100644 --- a/kubetest/aksengine.go +++ b/kubetest/aksengine.go @@ -1189,16 +1189,16 @@ func (c *aksEngineDeployer) DumpClusterLogs(localPath, gcsPath string) error { return nil } - var errors []string + var errs []string if err := logDumper(); err != nil { - errors = append(errors, err.Error()) + errs = append(errs, err.Error()) } if err := logDumperWindows(); err != nil { // don't log error since logDumperWindows failed is expected on non-Windows cluster _ = err } - if len(errors) != 0 { - return fmt.Errorf(strings.Join(errors, "\n")) + if len(errs) != 0 { + return errors.New(strings.Join(errs, "\n")) } return nil }