net/http: deflake TestLinuxSendfile

bradfitz · bradfitz · commit f9d406ebeaa0 · 2016-11-05T01:17:21.000Z
Fixes #17805 Change-Id: I30d3e63a82b3690a76f2bb33d59ae34c62a7fa59 Reviewed-on: https://go-review.googlesource.com/32759 Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org> Reviewed-by: Ian Lance Taylor <iant@golang.org>
diff --git a/src/net/http/fs_test.go b/src/net/http/fs_test.go
@@ -1116,10 +1116,9 @@ func TestLinuxSendfile(t *testing.T) {
 	Post(fmt.Sprintf("http://%s/quit", ln.Addr()), "", nil)
 	child.Wait()
 
-	rx := regexp.MustCompile(`sendfile(64)?\(\d+,\s*\d+,\s*NULL,\s*\d+\)\s*=\s*\d+\s*\n`)
-	rxResume := regexp.MustCompile(`<\.\.\. sendfile(64)? resumed> \)\s*=\s*\d+\s*\n`)
+	rx := regexp.MustCompile(`sendfile(64)?\(\d+,\s*\d+,\s*NULL,\s*\d+`)
 	out := buf.String()
-	if !rx.MatchString(out) && !rxResume.MatchString(out) {
+	if !rx.MatchString(out) {
 		t.Errorf("no sendfile system call found in:\n%s", out)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1116,10 +1116,9 @@ func TestLinuxSendfile(t *testing.T) {`
`1116`	`1116`	`Post(fmt.Sprintf("http://%s/quit", ln.Addr()), "", nil)`
`1117`	`1117`	`child.Wait()`
`1118`	`1118`
`1119`		- rx := regexp.MustCompile(`sendfile(64)?\(\d+,\s\d+,\sNULL,\s\d+\)\s=\s\d+\s\n`)
`1120`		- rxResume := regexp.MustCompile(`<\.\.\. sendfile(64)? resumed> \)\s=\s\d+\s*\n`)
	`1119`	+ rx := regexp.MustCompile(`sendfile(64)?\(\d+,\s\d+,\sNULL,\s*\d+`)
`1121`	`1120`	`out := buf.String()`
`1122`		`- if !rx.MatchString(out) && !rxResume.MatchString(out) {`
	`1121`	`+ if !rx.MatchString(out) {`
`1123`	`1122`	`t.Errorf("no sendfile system call found in:\n%s", out)`
`1124`	`1123`	`}`
`1125`	`1124`	`}`