From e236b6721c03033a2d475bdb6e3a0123213ac6e9 Mon Sep 17 00:00:00 2001 From: Matthew Dempsky Date: Thu, 31 Aug 2017 13:24:43 -0700 Subject: [PATCH] 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 TryBot-Result: Gobot Gobot Reviewed-by: Matthew Dempsky --- doc/articles/wiki/final-test.patch | 63 +++++++++++++----------------- 1 file changed, 27 insertions(+), 36 deletions(-) diff --git a/doc/articles/wiki/final-test.patch b/doc/articles/wiki/final-test.patch index 510825b319..fd7d625368 100644 --- a/doc/articles/wiki/final-test.patch +++ b/doc/articles/wiki/final-test.patch @@ -1,36 +1,27 @@ -*** final.go 2015-06-14 23:59:22.000000000 +0200 ---- final-test.go 2015-06-15 00:15:41.000000000 +0200 -*************** -*** 7,12 **** ---- 7,14 ---- - import ( - "html/template" - "io/ioutil" -+ "log" -+ "net" - "net/http" - "regexp" - ) -*************** -*** 85,89 **** - http.HandleFunc("/edit/", makeHandler(editHandler)) - http.HandleFunc("/save/", makeHandler(saveHandler)) - -! log.Fatal(http.ListenAndServe(":8080", nil)) - } ---- 87,101 ---- - http.HandleFunc("/edit/", makeHandler(editHandler)) - http.HandleFunc("/save/", makeHandler(saveHandler)) - -! l, err := net.Listen("tcp", "127.0.0.1:0") -! if err != nil { -! 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 - } +--- final.go 2017-08-31 13:19:00.422925489 -0700 ++++ final-test.go 2017-08-31 13:23:43.381391659 -0700 +@@ -8,6 +8,7 @@ + "html/template" + "io/ioutil" + "log" ++ "net" + "net/http" + "regexp" + ) +@@ -86,5 +87,15 @@ + http.HandleFunc("/edit/", makeHandler(editHandler)) + http.HandleFunc("/save/", makeHandler(saveHandler)) + +- log.Fatal(http.ListenAndServe(":8080", nil)) ++ l, err := net.Listen("tcp", "127.0.0.1:0") ++ if err != nil { ++ 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 + }