tour: fix go.mod module path

The supporting packages (pic, reader, tree, wc) are still
in golang.org/x/tour, so delete these copies.

Fix the remaining references in local.go to use
golang.org/x/website/tour instead of golang.org/x/tour
to find the content files.

While we are here, make go test ./... considerably faster
by parallelizing TestContent.

For golang/go#46501.

Change-Id: Ia80161830f5f2f87fb6e39a0ee39c4b176fb425b
Reviewed-on: https://go-review.googlesource.com/c/website/+/324395
Trust: Russ Cox <[email protected]>
Run-TryBot: Russ Cox <[email protected]>
Website-Publish: Russ Cox <[email protected]>
Reviewed-by: Dmitri Shuralyov <[email protected]>

Author: rsc

tour/content/content_test.go

@@ -14,6 +14,9 @@ import (
 	"path/filepath"
 	"strings"
 	"testing"
+
+	// Keep golang.org/x/tour in our go.mod require list for use during test.
+	_ "golang.org/x/tour/wc"
 )
 
 // Test that all the .go files inside the content file build
@@ -38,9 +41,12 @@ func TestContent(t *testing.T) {
 		if filepath.Base(path) == "content_test.go" {
 			return nil
 		}
-		if err := testSnippet(t, path, scratch); err != nil {
-			t.Errorf("%v: %v", path, err)
-		}
+		t.Run(path, func(t *testing.T) {
+			t.Parallel()
+			if err := testSnippet(t, path, scratch); err != nil {
+				t.Errorf("%v: %v", path, err)
+			}
+		})
 		return nil
 	})
 	if err != nil {

tour/go.mod

@@ -1,5 +1,8 @@
-module golang.org/x/tour
+module golang.org/x/website/tour
 
 go 1.11
 
-require golang.org/x/tools v0.1.3-0.20210525215409-a3eb095d6aee
+require (
+	golang.org/x/tools v0.1.3-0.20210525215409-a3eb095d6aee
+	golang.org/x/tour v0.1.0
+)

tour/go.sum

@@ -23,6 +23,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.3-0.20210525215409-a3eb095d6aee h1:qoXIhA/wpnHg2z8RiA/rZb66+iiULmKyO9olVAU+GfU=
 golang.org/x/tools v0.1.3-0.20210525215409-a3eb095d6aee/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tour v0.1.0 h1:OWzbINRoGf1wwBhKdFDpYwM88NM0d1SL/Nj6PagS6YE=
+golang.org/x/tour v0.1.0/go.mod h1:DUZC6G8mR1AXgXy73r8qt/G5RsefKIlSj6jBMc8b9Wc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=

tour/gotour/main.go

@@ -23,11 +23,6 @@ import (
 	"time"
 
 	"golang.org/x/tools/playground/socket"
-
-	// Imports so that go build/install automatically installs them.
-	_ "golang.org/x/tour/pic"
-	_ "golang.org/x/tour/tree"
-	_ "golang.org/x/tour/wc"
 )
 
 const (
@@ -58,20 +53,20 @@ func isRoot(path string) bool {
 //
 // TODO: Delete after Go 1.17 is out and we can just use embed; see CL 291849.
 func findRoot() (string, bool) {
-	// Try finding the golang.org/x/tour package in the
+	// Try finding the golang.org/x/website/tour package in the
 	// legacy GOPATH mode workspace or in build list.
-	p, err := build.Import("golang.org/x/tour", "", build.FindOnly)
+	p, err := build.Import("golang.org/x/website/tour", "", build.FindOnly)
 	if err == nil && isRoot(p.Dir) {
 		return p.Dir, true
 	}
 	// If that didn't work, perhaps we're not inside any module
 	// and the binary was built in module mode (e.g., 'go install
-	// golang.org/x/tour@latest' or 'go get golang.org/x/tour'
+	// golang.org/x/website/tour@latest' or 'go get golang.org/x/website/tour'
 	// outside a module).
 	// In that's the case, find out what version it is,
 	// and access its content from the module cache.
 	if info, ok := debug.ReadBuildInfo(); ok &&
-		info.Main.Path == "golang.org/x/tour" &&
+		info.Main.Path == "golang.org/x/website/tour" &&
 		info.Main.Replace == nil &&
 		info.Main.Version != "(devel)" {
 		// Make some assumptions for brevity:
@@ -80,7 +75,7 @@ func findRoot() (string, bool) {
 		// • the version isn't "(devel)"
 		// They should hold for the use cases we care about, until this
 		// entire mechanism is obsoleted by file embedding.
-		out, execError := exec.Command("go", "mod", "download", "-json", "--", "golang.org/x/tour@"+info.Main.Version).Output()
+		out, execError := exec.Command("go", "mod", "download", "-json", "--", "golang.org/x/website/tour@"+info.Main.Version).Output()
 		var tourRoot struct{ Dir string }
 		jsonError := json.Unmarshal(out, &tourRoot)
 		if execError == nil && jsonError == nil && isRoot(tourRoot.Dir) {

tour/local.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main // import "golang.org/x/tour"
+package main // import "golang.org/x/website/tour"
 
 import (
 	"bytes"