From: Bryan C. Mills <bcmills@google.com>
Date: Wed, 17 Aug 2022 16:51:10 +0000 (-0400)
Subject: [release-branch.go1.19] cmd/go: skip test cases that depend on gopkg.in
X-Git-Tag: go1.19.6~7
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=34edacc5e129e01642c64cd8a0cbce667a695823;p=gostls13.git

[release-branch.go1.19] 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>
(cherry picked from commit c7f870ebc41029e07e7ffd8ff2d96b91fd83cd40)
Reviewed-on: https://go-review.googlesource.com/c/go/+/466857
Reviewed-by: Heschi Kreinick <heschi@google.com>
Run-TryBot: David Chase <drchase@google.com>
Reviewed-by: Than McIntosh <thanm@google.com>
---

diff --git a/src/cmd/go/internal/modfetch/coderepo_test.go b/src/cmd/go/internal/modfetch/coderepo_test.go
index 967978cd4d..3dd1b1cca6 100644
--- 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 beba3e7b02..58bbc7651b 100644
--- 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