Skip to content

Commit

Permalink
Merge branch 'microsoft/release-branch.go1.18' into dev/auto-sync/mic…
Browse files Browse the repository at this point in the history
…rosoft/dev.boringcrypto.go1.18
  • Loading branch information
dagood committed May 10, 2022
2 parents 1d9d146 + 5f7ae4e commit 91166fa
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions patches/0002-net-Skip-TestDialCancel-on-linux-arm64.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ The test is flaky on our linux-arm64 builder and gets "network is unreachable".
1 file changed, 4 insertions(+)

diff --git a/src/net/dial_test.go b/src/net/dial_test.go
index b9aead0371..f4f383a365 100644
index 3cce444e5c..d001fc36af 100644
--- a/src/net/dial_test.go
+++ b/src/net/dial_test.go
@@ -758,6 +758,10 @@ func TestDialerKeepAlive(t *testing.T) {
Expand All @@ -20,6 +20,6 @@ index b9aead0371..f4f383a365 100644
+ t.Skip("skipping on linux-arm64-*; incompatible network config? issue 37330")
+ }
+
blackholeIPPort := JoinHostPort(slowDst4, "1234")
if !supportsIPv4() {
blackholeIPPort = JoinHostPort(slowDst6, "1234")
if strings.HasPrefix(testenv.Builder(), "darwin-arm64") {
// The darwin-arm64 machines run in an environment that's not
// compatible with this test.

0 comments on commit 91166fa

Please sign in to comment.