Skip to content

pkg/test: remove dependence on ctx.t #1195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 12, 2019
Merged

pkg/test: remove dependence on ctx.t #1195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 6 additions & 13 deletions pkg/test/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,26 +67,19 @@ func (ctx *TestCtx) GetID() string {
}

func (ctx *TestCtx) Cleanup() {
for i := len(ctx.cleanupFns) - 1; i >= 0; i-- {
err := ctx.cleanupFns[i]()
if err != nil {
ctx.t.Errorf("A cleanup function failed with error: (%v)\n", err)
}
}
}

// cleanupNoT is a modified version of Cleanup; does not use t for logging, instead uses log
// intended for use by MainEntry, which does not have a testing.T
func (ctx *TestCtx) cleanupNoT() {
failed := false
for i := len(ctx.cleanupFns) - 1; i >= 0; i-- {
err := ctx.cleanupFns[i]()
if err != nil {
failed = true
log.Errorf("A cleanup function failed with error: (%v)", err)
if ctx.t != nil {
ctx.t.Errorf("A cleanup function failed with error: (%v)\n", err)
} else {
log.Errorf("A cleanup function failed with error: (%v)", err)
}
}
}
if failed {
if ctx.t == nil && failed {
log.Fatal("A cleanup function failed")
}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/test/main_entry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func MainEntry(m *testing.M) {
log.Infof("Local operator stdout: %s", string(localCmdOutBuf.Bytes()))
log.Infof("Local operator stderr: %s", string(localCmdErrBuf.Bytes()))
}
ctx.cleanupNoT()
ctx.Cleanup()
os.Exit(exitCode)
}()
// create crd
Expand Down