From f8ed4539eb02e168aeeba891c38973336aa8e21c Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 21 Feb 2017 07:14:51 -0800 Subject: [PATCH] [release-branch.go1.8] os/exec: deflake TestStdinCloseRace MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Stop reporting errors from cmd.Process.Kill; they don't matter for purposes of this test, and they can occur if the process exits quickly. Fixes #19211. Fixes #19213. Change-Id: I1a0bb9170220ca69199abb8e8811b1dde43e1897 Reviewed-on: https://go-review.googlesource.com/37309 Run-TryBot: Ian Lance Taylor TryBot-Result: Gobot Gobot Reviewed-by: Daniel Martí Reviewed-by: Brad Fitzpatrick (cherry picked from commit 35ffca31b180e6f9da6035326132f048980dc58c) Reviewed-on: https://go-review.googlesource.com/38607 Run-TryBot: Brad Fitzpatrick Reviewed-by: Ian Lance Taylor --- src/os/exec/exec_test.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/os/exec/exec_test.go b/src/os/exec/exec_test.go index 34337450a0..bd20dd4955 100644 --- a/src/os/exec/exec_test.go +++ b/src/os/exec/exec_test.go @@ -262,9 +262,13 @@ func TestStdinCloseRace(t *testing.T) { t.Fatalf("Start: %v", err) } go func() { - if err := cmd.Process.Kill(); err != nil { - t.Errorf("Kill: %v", err) - } + // We don't check the error return of Kill. It is + // possible that the process has already exited, in + // which case Kill will return an error "process + // already finished". The purpose of this test is to + // see whether the race detector reports an error; it + // doesn't matter whether this Kill succeeds or not. + cmd.Process.Kill() }() go func() { // Send the wrong string, so that the child fails even -- 2.50.0