From 5d580336821b05684c00ebaf9fb4a8318a40788e Mon Sep 17 00:00:00 2001 From: Dmitriy Vyukov Date: Fri, 18 Jul 2014 12:44:24 +0400 Subject: [PATCH] go/printer: simplify test Pre Go1? LGTM=r R=golang-codereviews, r CC=golang-codereviews https://golang.org/cl/115870043 --- src/pkg/go/printer/printer_test.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/pkg/go/printer/printer_test.go b/src/pkg/go/printer/printer_test.go index 9cab1bee35..3b0570e5b5 100644 --- a/src/pkg/go/printer/printer_test.go +++ b/src/pkg/go/printer/printer_test.go @@ -159,13 +159,6 @@ func runcheck(t *testing.T, source, golden string, mode checkMode) { } func check(t *testing.T, source, golden string, mode checkMode) { - // start a timer to produce a time-out signal - tc := make(chan int) - go func() { - time.Sleep(10 * time.Second) // plenty of a safety margin, even for very slow machines - tc <- 0 - }() - // run the test cc := make(chan int) go func() { @@ -173,9 +166,9 @@ func check(t *testing.T, source, golden string, mode checkMode) { cc <- 0 }() - // wait for the first finisher + // wait with timeout select { - case <-tc: + case <-time.After(10 * time.Second): // plenty of a safety margin, even for very slow machines // test running past time out t.Errorf("%s: running too slowly", source) case <-cc: -- 2.48.1