From 846e522ffc157c12ba244c2c8a2c6adb1ed789f7 Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Thu, 5 Mar 2015 13:52:48 -0800 Subject: [PATCH] Remove overcomplicated logic of SIGCHLD from TestNsenterDeadPid It lead to some race which hanged test. Signed-off-by: Alexander Morozov --- nsenter/nsenter_test.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/nsenter/nsenter_test.go b/nsenter/nsenter_test.go index 274d67d04..34e1f5211 100644 --- a/nsenter/nsenter_test.go +++ b/nsenter/nsenter_test.go @@ -5,9 +5,7 @@ import ( "fmt" "os" "os/exec" - "os/signal" "strings" - "syscall" "testing" ) @@ -67,16 +65,10 @@ func TestNsenterInvalidPid(t *testing.T) { } func TestNsenterDeadPid(t *testing.T) { - - c := make(chan os.Signal) - signal.Notify(c, syscall.SIGCHLD) dead_cmd := exec.Command("true") - if err := dead_cmd.Start(); err != nil { + if err := dead_cmd.Run(); err != nil { t.Fatal(err) } - defer dead_cmd.Wait() - <-c // dead_cmd is zombie - args := []string{"nsenter-exec"} cmd := &exec.Cmd{