diff options
-rw-r--r-- | src/cmd/go/internal/modfetch/coderepo_test.go | 10 | ||||
-rw-r--r-- | src/cmd/go/testdata/script/mod_gopkg_unstable.txt | 2 |
2 files changed, 11 insertions, 1 deletions
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 |