github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Only run tests if start hook succeeds

Browse Source
This commit is contained in:
ppacher
2020-04-06 13:11:55 +02:00
parent 985e770c27
commit 81d2b6309d
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/pmtesting/testing.go
View File

@@ -81,14 +81,19 @@ func TestMainWithHooks(m *testing.M, module *modules.Module, afterStartFn, befor
fmt.Fprintf(os.Stderr, "failed to setup test: %s\n", err) fmt.Fprintf(os.Stderr, "failed to setup test: %s\n", err)
exitCode = 1 exitCode = 1
} else { } else {
runTests := true
if afterStartFn != nil { if afterStartFn != nil {
if err := afterStartFn(); err != nil { if err := afterStartFn(); err != nil {
fmt.Fprintf(os.Stderr, "failed to run test start hook: %s\n", err) fmt.Fprintf(os.Stderr, "failed to run test start hook: %s\n", err)
runTests = false
exitCode = 1 exitCode = 1
} }
} }
// run tests
exitCode = m.Run() if runTests {
// run tests
exitCode = m.Run()
}
} }
if beforeStopFn != nil { if beforeStopFn != nil {