cmd/go: skip test cases that depend on gopkg.in

Updates #54503.

Change-Id: Ie13d028b09260d2d316c343b3ea812bb9cce4e6d
Reviewed-on: https://go-review.googlesource.com/c/go/+/424594
Auto-Submit: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Bryan Mills <bcmills@google.com>
Reviewed-by: Russ Cox <rsc@golang.org>

diff --git a/src/cmd/go/internal/modfetch/coderepo_test.go b/src/cmd/go/internal/modfetch/coderepo_test.go
index 967978cd4d178a535e3a60befc15b22865b7dd9a..3dd1b1cca6af07a0636bad11f053b08e0a1f14dc 100644 (file)
--- a/src/cmd/go/internal/modfetch/coderepo_test.go
+++ b/src/cmd/go/internal/modfetch/coderepo_test.go
@@ -578,6 +578,10 @@ func TestCodeRepo(t *testing.T) {
        for _, tt := range codeRepoTests {
                f := func(tt codeRepoTest) func(t *testing.T) {
                        return func(t *testing.T) {
+                               if strings.Contains(tt.path, "gopkg.in") {
+                                       testenv.SkipFlaky(t, 54503)
+                               }
+
                                t.Parallel()
                                if tt.vcs != "mod" {
                                        testenv.MustHaveExecPath(t, tt.vcs)
@@ -811,8 +815,12 @@ func TestCodeRepoVersions(t *testing.T) {
 
        t.Run("parallel", func(t *testing.T) {
                for _, tt := range codeRepoVersionsTests {
+                       tt := tt
                        t.Run(strings.ReplaceAll(tt.path, "/", "_"), func(t *testing.T) {
-                               tt := tt
+                               if strings.Contains(tt.path, "gopkg.in") {
+                                       testenv.SkipFlaky(t, 54503)
+                               }
+
                                t.Parallel()
                                if tt.vcs != "mod" {
                                        testenv.MustHaveExecPath(t, tt.vcs)

diff --git a/src/cmd/go/testdata/script/mod_gopkg_unstable.txt b/src/cmd/go/testdata/script/mod_gopkg_unstable.txt
index beba3e7b02cd6b3e12d62428e5df0ee61a544661..58bbc7651b3b5351dab83c0ee3dd14d1e9927417 100644 (file)
--- a/src/cmd/go/testdata/script/mod_gopkg_unstable.txt
+++ b/src/cmd/go/testdata/script/mod_gopkg_unstable.txt
@@ -10,6 +10,8 @@ go list
 [!net] skip
 [!exec:git] skip
 
+skip  # TODO(#54503): redirect gopkg.in requests to a local server and re-enable.
+
 env GOPROXY=direct
 env GOSUMDB=off
 go get gopkg.in/macaroon-bakery.v2-unstable/bakery