kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

pkg/signal.TestTrap: use a subtest 

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-01-12 18:02:15 +01:00
parent c855d411bf
commit 8f158db4ed
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/signal/trap_linux_test.go
View File

@ -14,6 +14,7 @@ import (
)
func buildTestBinary(t *testing.T, tmpdir string, prefix string) (string, string) {
t.Helper()
tmpDir, err := ioutil.TempDir(tmpdir, prefix)
assert.NilError(t, err)
exePath := tmpDir + "/" + prefix
@ -41,24 +42,25 @@ func TestTrap(t *testing.T) {
defer os.RemoveAll(tmpDir)
for _, v := range sigmap {
cmd := exec.Command(exePath)
cmd.Env = append(os.Environ(), "SIGNAL_TYPE="+v.name)
if v.multiple {
cmd.Env = append(cmd.Env, "IF_MULTIPLE=1")
}
err := cmd.Start()
assert.NilError(t, err)
err = cmd.Wait()
if e, ok := err.(*exec.ExitError); ok {
t.Run(v.name, func(t *testing.T) {
cmd := exec.Command(exePath)
cmd.Env = append(os.Environ(), "SIGNAL_TYPE="+v.name)
if v.multiple {
cmd.Env = append(cmd.Env, "IF_MULTIPLE=1")
}
err := cmd.Start()
assert.NilError(t, err)
err = cmd.Wait()
e, ok := err.(*exec.ExitError)
assert.Assert(t, ok, "expected exec.ExitError, got %T", e)
code := e.Sys().(syscall.WaitStatus).ExitStatus()
if v.multiple {
assert.Check(t, is.DeepEqual(128+int(v.signal.(syscall.Signal)), code))
} else {
assert.Check(t, is.Equal(99, code))
}
continue
}
t.Fatal("process didn't end with any error")
})
}
}