Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gcsweb/cmd/gcsweb/gcsweb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
})
}
Expand Down
8 changes: 4 additions & 4 deletions kubetest/aksengine.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down