(API change): Use different mocks.UDPLikeConn for concurrent tests

ooni · Jun 19, 2023 · 35c1a52 · 35c1a52
1 parent 17aef9d
commit 35c1a52
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/internal/measurexlite/quic_test.go b/internal/measurexlite/quic_test.go
@@ -97,6 +97,9 @@ func TestNewQUICDialerWithoutResolver(t *testing.T) {
 		pconn := &mocks.UDPLikeConn{
 			MockLocalAddr: func() net.Addr {
 				return &net.UDPAddr{
+					// quic-go does not allow the use of the same net.PacketConn for multiple "Dial"
+					// calls (unless a quic.Transport is used), so we have to make sure to mock local
+					// addresses with different ports, as tests run in parallel.
 					Port: 0,
 				}
 			},
@@ -207,7 +210,10 @@ func TestNewQUICDialerWithoutResolver(t *testing.T) {
 		pconn := &mocks.UDPLikeConn{
 			MockLocalAddr: func() net.Addr {
 				return &net.UDPAddr{
-					Port: 0,
+					// quic-go does not allow the use of the same net.PacketConn for multiple "Dial"
+					// calls (unless a quic.Transport is used), so we have to make sure to mock local
+					// addresses with different ports, as tests run in parallel.
+					Port: 1,
 				}
 			},
 			MockRemoteAddr: func() net.Addr {

diff --git a/internal/measurexlite/trace_test.go b/internal/measurexlite/trace_test.go
@@ -536,6 +536,9 @@ func TestTrace(t *testing.T) {
 			pconn := &mocks.UDPLikeConn{
 				MockLocalAddr: func() net.Addr {
 					return &net.UDPAddr{
+						// quic-go does not allow the use of the same net.PacketConn for multiple "Dial"
+						// calls (unless a quic.Transport is used), so we have to make sure to mock local
+						// addresses with different ports, as tests run in parallel.
 						Port: 0,
 					}
 				},