cmd/golangorg: drop "at least Go 1.19" check The go.mod file enforces Go 1.23.0 or higher. Also drop the obsolete skip for /doc/godebug. For golang/go#54200. Change-Id: Iaab9bf954dfae72074b5c9b7cdfd5128871e62d6 Reviewed-on: https://go-review.googlesource.com/c/website/+/655655 Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Robert Findley <rfindley@google.com>
diff --git a/cmd/golangorg/server_test.go b/cmd/golangorg/server_test.go index d796edb..d69a9c3 100644 --- a/cmd/golangorg/server_test.go +++ b/cmd/golangorg/server_test.go
@@ -7,7 +7,6 @@ import ( "bytes" "fmt" - "go/build" "io/fs" "net/http/httptest" "net/url" @@ -32,27 +31,13 @@ t.Fatal(err) } for _, file := range files { - switch filepath.ToSlash(file) { - case "testdata/live.txt": + if filepath.ToSlash(file) == "testdata/live.txt" { continue - case "testdata/go1.19.txt": - if !haveRelease("go1.19") { - continue - } } webtest.TestHandler(t, file, h) } } -func haveRelease(release string) bool { - for _, tag := range build.Default.ReleaseTags { - if tag == release { - return true - } - } - return false -} - var bads = []string{ "&lt;", "&gt;", @@ -231,11 +216,6 @@ return } } - if u.Path == "/doc/godebug" { - // Lives in GOROOT and does not exist in Go 1.20, - // so skip the check to avoid failing the test on Go 1.20. - return - } // Clear #fragment and build up fully qualified https://go.dev/ URL and check. // Only check each link one time during this test,
diff --git a/cmd/golangorg/testdata/go1.19.txt b/cmd/golangorg/testdata/go1.19.txt deleted file mode 100644 index e1c5fb7..0000000 --- a/cmd/golangorg/testdata/go1.19.txt +++ /dev/null
@@ -1,5 +0,0 @@ -GET https://golang.org/pkg/sync/atomic/?m=old -redirect == https://go.dev/pkg/sync/atomic/?m=old - -GET https://go.dev/pkg/sync/atomic/?m=old -body contains func (x *Pointer[T]) Load() *T
diff --git a/cmd/golangorg/testdata/web.txt b/cmd/golangorg/testdata/web.txt index de97764..f04b483 100644 --- a/cmd/golangorg/testdata/web.txt +++ b/cmd/golangorg/testdata/web.txt
@@ -313,6 +313,12 @@ body ~ Got1xxResponse.*// Go 1\.11 body ~ GotFirstResponseByte func\(\)\s*$ +GET https://golang.org/pkg/sync/atomic/?m=old +redirect == https://go.dev/pkg/sync/atomic/?m=old + +GET https://go.dev/pkg/sync/atomic/?m=old +body contains func (x *Pointer[T]) Load() *T + GET https://golang.org/pkg/os/?m=old redirect == https://go.dev/pkg/os/?m=old