qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-17 09:24:43 -07:00
Code Releases Activity

flag: fix TestExitCode on Plan 9

Browse Source 
CL 221427 added TestExitCode. This test is failing
on Plan 9 because ExitCode is always equal to 1
on error since Plan 9 use error strings.

This change fixes TestExitCode by checking that
ExitCode is equal to 1 on error instead of the
specific value.

Fixes #38237.

Change-Id: Ie269722e731e275e5bfc51644c1fa6be76525f1f
Reviewed-on: https://go-review.googlesource.com/c/go/+/227158
Run-TryBot: David du Colombier <0intro@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
This commit is contained in:
David du Colombier 2020-04-03 18:57:46 +02:00 committed by Bryan C. Mills
parent c4f875e84e
commit e31d741801
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/flag/flag_test.go
View File

@ -13,6 +13,7 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"os/exec" "os/exec"
"runtime"
"sort" "sort"
"strconv" "strconv"
"strings" "strings"
@ -599,6 +600,10 @@ func TestExitCode(t *testing.T) {
) )
cmd.Run() cmd.Run()
got := cmd.ProcessState.ExitCode() got := cmd.ProcessState.ExitCode()
// ExitCode is either 0 or 1 on Plan 9.
if runtime.GOOS == "plan9" && test.expectExit != 0 {
test.expectExit = 1
}
if got != test.expectExit { if got != test.expectExit {
t.Errorf("unexpected exit code for test case %+v \n: got %d, expect %d", t.Errorf("unexpected exit code for test case %+v \n: got %d, expect %d",
test, got, test.expectExit) test, got, test.expectExit)