diff options
| author | Bryan C. Mills <bcmills@google.com> | 2022-08-17 12:51:10 -0400 |
|---|---|---|
| committer | David Chase <drchase@google.com> | 2023-02-09 20:12:58 +0000 |
| commit | 34edacc5e129e01642c64cd8a0cbce667a695823 (patch) | |
| tree | 9e8ea256a9556440d96b35d76e9f0cdf42c3e089 | |
| parent | b7880cf6c7c4df04bcee4fa17f67a56117689e94 (diff) | |
| download | go-git-34edacc5e129e01642c64cd8a0cbce667a695823.tar.gz | |
[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>
| -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 |