cleanup

FerretDB · chilagrow · Jun 29, 2023 · Jun 21, 2023 · Jun 21, 2023 · Jun 23, 2023
commit 805fcb2d348f6e5d255f79d961f9efc26bdf12aa
@@ -474,11 +474,6 @@ func TestCommandWhatsMyURIConnection(t *testing.T) {
 		u, err := url.Parse(s.MongoDBURI)
 		require.NoError(t, err)
 
-		q2 := u.Query()
-		q2.Set("maxPoolSize", "1")
-		q2.Set("minPoolSize", "1")
-		u.RawQuery = q2.Encode()
-
 		client2, err := mongo.Connect(s.Ctx, options.Client().ApplyURI(u.String()))
 		require.NoError(t, err)
 

@@ -1396,11 +1396,6 @@ func TestQueryCommandGetMoreConnection(t *testing.T) {
 		u, err := url.Parse(s.MongoDBURI)
 		require.NoError(t, err)
 
-		q2 := u.Query()
-		q2.Set("maxPoolSize", "1")
-		q2.Set("minPoolSize", "1")
-		u.RawQuery = q2.Encode()
-
 		client2, err := mongo.Connect(s.Ctx, options.Client().ApplyURI(u.String()))
 		require.NoError(t, err)
 

@@ -36,6 +36,8 @@ type mongoDBURIOpts struct {
 	hostPort       string // for TCP and TLS
 	unixSocketPath string
 	tlsAndAuth     bool
+	maxPoolSize    string
+	minPoolSize    string
 }
 
 // mongoDBURI builds MongoDB URI with given options.
@@ -65,6 +67,14 @@ func mongoDBURI(tb testing.TB, opts *mongoDBURIOpts) string {
 		user = url.UserPassword("username", "password")
 	}
 
+	if opts.maxPoolSize != "" {
+		q.Set("maxPoolSize", opts.maxPoolSize)
+	}
+
+	if opts.minPoolSize != "" {
+		q.Set("minPoolSize", opts.minPoolSize)
+	}
+
 	// TODO https://github.com/FerretDB/FerretDB/issues/1507
 	u := &url.URL{
 		Scheme:   "mongodb",

@@ -17,6 +17,7 @@ package setup
 import (
 	"context"
 	"errors"
+	"net/url"
 	"os"
 	"path/filepath"
 	"strings"
@@ -65,7 +66,7 @@ func unixSocketPath(tb testing.TB) string {
 
 // setupListener starts in-process FerretDB server that runs until ctx is canceled.
 // It returns client and MongoDB URI of that listener.
-func setupListener(tb testing.TB, ctx context.Context, logger *zap.Logger) (*mongo.Client, string) {
+func setupListener(tb testing.TB, ctx context.Context, extraOpts url.Values, logger *zap.Logger) (*mongo.Client, string) {
 	tb.Helper()
 
 	_, span := otel.Tracer("").Start(ctx, "setupListener")
@@ -196,7 +197,10 @@ func setupListener(tb testing.TB, ctx context.Context, logger *zap.Logger) (*mon
 		<-runDone
 	})
 
-	var clientOpts mongoDBURIOpts
+	clientOpts := mongoDBURIOpts{
+		maxPoolSize: extraOpts.Get("maxPoolSize"),
+		minPoolSize: extraOpts.Get("minPoolSize"),
+	}
 
 	switch {
 	case *targetTLSF:

@@ -140,7 +140,7 @@ func SetupWithOpts(tb testing.TB, opts *SetupOpts) *SetupResult {
 	var uri string
 
 	if *targetURLF == "" {
-		client, uri = setupListener(tb, setupCtx, logger)
+		client, uri = setupListener(tb, setupCtx, opts.ExtraOptions, logger)
 	} else {
 		u, err := url.Parse(*targetURLF)
 		require.NoError(tb, err)
@@ -153,8 +153,8 @@ func SetupWithOpts(tb testing.TB, opts *SetupOpts) *SetupResult {
 		}
 
 		u.RawQuery = q.Encode()
-		client = setupClient(tb, setupCtx, u.String())
-		uri = *targetURLF
+		uri = u.String()
+		client = setupClient(tb, setupCtx, uri)
 	}
 
 	// register cleanup function after setupListener registers its own to preserve full logs

@@ -94,7 +94,7 @@ func SetupCompatWithOpts(tb testing.TB, opts *SetupCompatOpts) *SetupCompatResul
 
 	var targetClient *mongo.Client
 	if *targetURLF == "" {
-		targetClient, _ = setupListener(tb, setupCtx, logger)
+		targetClient, _ = setupListener(tb, setupCtx, nil, logger)
 	} else {
 		targetClient = setupClient(tb, setupCtx, *targetURLF)
 	}