Skip to content

Commit

Permalink
test/fixedbugs: bump issue21576.go's timeout to 1min
Browse files Browse the repository at this point in the history
Increases the exec timeout from 5sec to 1min, but
also print out the error value on any test failure.

Fixes golang#34836

Change-Id: Ida2b8bd460243491ef0f90dfe0f978dfe02a0703
Reviewed-on: https://go-review.googlesource.com/c/go/+/200519
Run-TryBot: Emmanuel Odeke <emm.odeke@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
  • Loading branch information
odeke-em committed Oct 11, 2019
1 parent 2ac8f79 commit 1627714
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions test/fixedbugs/issue21576.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ func main() {
log.Fatalf("Write error %v", err)
}

ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
// Using a timeout of 1 minute in case other factors might slow
// down the start of "go run". See https://golang.org/issue/34836.
ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
defer cancel()

cmd := exec.CommandContext(ctx, "go", "run", file)
Expand All @@ -55,6 +57,6 @@ func main() {

want := []byte("fatal error: all goroutines are asleep - deadlock!")
if !bytes.Contains(output, want) {
log.Fatalf("Unmatched error message %q:\nin\n%s", want, output)
log.Fatalf("Unmatched error message %q:\nin\n%s\nError: %v", want, output, err)
}
}

0 comments on commit 1627714

Please sign in to comment.