Commit e236b672 authored by Matthew Dempsky's avatar Matthew Dempsky

doc/articles/wiki: fix final-test.patch

Fixes test regression introduced by golang.org/cl/53071.

Change-Id: Ibb085cf6d6be7b91b7c90b7bc6237c10f3097703
Reviewed-on: https://go-review.googlesource.com/60775
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: default avatarMatthew Dempsky <mdempsky@google.com>
parent f316e1a8
*** final.go 2015-06-14 23:59:22.000000000 +0200 --- final.go 2017-08-31 13:19:00.422925489 -0700
--- final-test.go 2015-06-15 00:15:41.000000000 +0200 +++ final-test.go 2017-08-31 13:23:43.381391659 -0700
*************** @@ -8,6 +8,7 @@
*** 7,12 **** "html/template"
--- 7,14 ---- "io/ioutil"
import ( "log"
"html/template" + "net"
"io/ioutil" "net/http"
+ "log" "regexp"
+ "net" )
"net/http" @@ -86,5 +87,15 @@
"regexp" http.HandleFunc("/edit/", makeHandler(editHandler))
) http.HandleFunc("/save/", makeHandler(saveHandler))
***************
*** 85,89 **** - log.Fatal(http.ListenAndServe(":8080", nil))
http.HandleFunc("/edit/", makeHandler(editHandler)) + l, err := net.Listen("tcp", "127.0.0.1:0")
http.HandleFunc("/save/", makeHandler(saveHandler)) + if err != nil {
+ log.Fatal(err)
! log.Fatal(http.ListenAndServe(":8080", nil)) + }
} + err = ioutil.WriteFile("final-test-port.txt", []byte(l.Addr().String()), 0644)
--- 87,101 ---- + if err != nil {
http.HandleFunc("/edit/", makeHandler(editHandler)) + log.Fatal(err)
http.HandleFunc("/save/", makeHandler(saveHandler)) + }
+ s := &http.Server{}
! l, err := net.Listen("tcp", "127.0.0.1:0") + s.Serve(l)
! if err != nil { + return
! log.Fatal(err) }
! }
! err = ioutil.WriteFile("final-test-port.txt", []byte(l.Addr().String()), 0644)
! if err != nil {
! log.Fatal(err)
! }
! s := &http.Server{}
! s.Serve(l)
! return
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment