From 41f4ee4e59bf2caa8994b0b05b9af183daf6c7cc Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Wed, 12 Oct 2016 14:52:42 +0000 Subject: [PATCH] cmd/godoc, cmd/fiximports: fix or skip failing tests at tip Fix godoc test failure. Skip fiximports test failure for now, to not hide other failures. (tracking bug to fix properly in golang/go#17417) x/tools being broken is preventing use of trybots for unrelated CLs. Change-Id: I3a1deee4036096e0377cf8b63fabe444c58dd86e Reviewed-on: https://go-review.googlesource.com/30953 Reviewed-by: Russ Cox Reviewed-by: Alan Donovan --- cmd/fiximports/main_test.go | 5 ++++- cmd/godoc/godoc_test.go | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmd/fiximports/main_test.go b/cmd/fiximports/main_test.go index e6be1104..75319a02 100644 --- a/cmd/fiximports/main_test.go +++ b/cmd/fiximports/main_test.go @@ -200,7 +200,10 @@ import ( } // Compare stderr output. - if stderr.(*bytes.Buffer).String() != test.wantStderr { + if got := stderr.(*bytes.Buffer).String(); got != test.wantStderr { + if strings.Contains(got, "vendor/golang_org/x/text/unicode/norm") { + t.Skip("skipping known-broken test; see golang.org/issue/17417") + } t.Errorf("#%d. stderr: got <<%s>>, want <<%s>>", i, stderr, test.wantStderr) } diff --git a/cmd/godoc/godoc_test.go b/cmd/godoc/godoc_test.go index e4ab12f8..5736296a 100644 --- a/cmd/godoc/godoc_test.go +++ b/cmd/godoc/godoc_test.go @@ -277,7 +277,7 @@ func testWeb(t *testing.T, withIndex bool) { { path: "/cmd/compile/internal/amd64/", match: []string{ - `href="/src/cmd/compile/internal/amd64/reg.go"`, + `href="/src/cmd/compile/internal/amd64/prog.go"`, }, }, }