From f850a6ffec1e28104acd96c1b25150d0d9a2acfa Mon Sep 17 00:00:00 2001 From: Marco Munizaga Date: Wed, 18 May 2022 11:52:33 -0700 Subject: [PATCH] Only run the 50 connection test on linux --- p2p/transport/testsuite/stream_suite.go | 10 ++++++++++ p2p/transport/testsuite/utils_suite.go | 10 +++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/p2p/transport/testsuite/stream_suite.go b/p2p/transport/testsuite/stream_suite.go index e7770bfa71..43bad422de 100644 --- a/p2p/transport/testsuite/stream_suite.go +++ b/p2p/transport/testsuite/stream_suite.go @@ -427,6 +427,16 @@ func SubtestStress50Conn10Stream50Msg(t *testing.T, ta, tb transport.Transport, }) } +func SubtestStress5Conn10Stream50Msg(t *testing.T, ta, tb transport.Transport, maddr ma.Multiaddr, peerA peer.ID) { + SubtestStress(t, ta, tb, maddr, peerA, Options{ + ConnNum: 5, + StreamNum: 10, + MsgNum: 50, + MsgMax: 100, + MsgMin: 100, + }) +} + func SubtestStress1Conn1000Stream10Msg(t *testing.T, ta, tb transport.Transport, maddr ma.Multiaddr, peerA peer.ID) { SubtestStress(t, ta, tb, maddr, peerA, Options{ ConnNum: 1, diff --git a/p2p/transport/testsuite/utils_suite.go b/p2p/transport/testsuite/utils_suite.go index 1d520ff262..8854ce5353 100644 --- a/p2p/transport/testsuite/utils_suite.go +++ b/p2p/transport/testsuite/utils_suite.go @@ -21,7 +21,7 @@ var Subtests = []func(t *testing.T, ta, tb transport.Transport, maddr ma.Multiad SubtestStress1Conn1Stream1Msg, SubtestStress1Conn1Stream100Msg, SubtestStress1Conn100Stream100Msg, - SubtestStress50Conn10Stream50Msg, + SubtestStress5Conn10Stream50Msg, SubtestStress1Conn1000Stream10Msg, SubtestStress1Conn100Stream100Msg10MB, SubtestStreamOpenStress, @@ -37,6 +37,14 @@ func SubtestTransport(t *testing.T, ta, tb transport.Transport, addr string, pee if err != nil { t.Fatal(err) } + + if runtime.GOOS == "linux" { + // Only run this test on Linux since macOS runs into buffering issues on CI + // with this many connections. See + // https://github.com/libp2p/go-libp2p/issues/1498. + Subtests = append(Subtests, SubtestStress50Conn10Stream50Msg) + } + for _, f := range Subtests { t.Run(getFunctionName(f), func(t *testing.T) { f(t, ta, tb, maddr, peerA)