diff options
author | Alexander Rakoczy <alex@golang.org> | 2020-12-14 11:42:42 -0500 |
---|---|---|
committer | Alexander Rakoczy <alex@golang.org> | 2020-12-14 11:42:42 -0500 |
commit | 267975dc4732b6f6a62a7d33a85de34efef180b7 (patch) | |
tree | fd69c51067a279d959b233b94bccf2bf969317a7 /src/os/signal/signal_test.go | |
parent | 63bc23b5452f6605df3e40ce7ecdd8b0348792af (diff) | |
parent | 6c64b6db6802818dd9a4789cdd564f19b70b6b4c (diff) | |
download | go-git-267975dc4732b6f6a62a7d33a85de34efef180b7.tar.gz |
Merge branch 'master' into dev.regabi
Change-Id: I098acdbc5e2676aeb8700d935e796a9c29d04b88
Diffstat (limited to 'src/os/signal/signal_test.go')
-rw-r--r-- | src/os/signal/signal_test.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/os/signal/signal_test.go b/src/os/signal/signal_test.go index 23e33fe82b..8945cbfccb 100644 --- a/src/os/signal/signal_test.go +++ b/src/os/signal/signal_test.go @@ -12,7 +12,6 @@ import ( "flag" "fmt" "internal/testenv" - "io/ioutil" "os" "os/exec" "runtime" @@ -304,7 +303,7 @@ func TestDetectNohup(t *testing.T) { os.Remove("nohup.out") out, err := exec.Command("/usr/bin/nohup", os.Args[0], "-test.run=TestDetectNohup", "-check_sighup_ignored").CombinedOutput() - data, _ := ioutil.ReadFile("nohup.out") + data, _ := os.ReadFile("nohup.out") os.Remove("nohup.out") if err != nil { t.Errorf("ran test with -check_sighup_ignored under nohup and it failed: expected success.\nError: %v\nOutput:\n%s%s", err, out, data) |