Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow the usage of proxy/diff mode in tests #477

Merged
merged 2 commits into from
Apr 15, 2022
Merged

Allow the usage of proxy/diff mode in tests #477

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49257d9
Allow the usage of proxy/diff mode in tests
AlekSi Apr 14, 2022
aa41226
Merge branch 'main' into test-with-proxy
seeforschauer Apr 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions integration/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ import (
)

var (
startupPort = flag.String("port", "ferretdb", "port to use")
startupPortF = flag.String("port", "ferretdb", "port to use")
proxyAddrF = flag.String("proxy-addr", "", "use proxy for in-process listener mode")

startupOnce sync.Once
)
Expand Down Expand Up @@ -71,7 +72,7 @@ func setupWithOpts(t *testing.T, opts *setupOpts) (context.Context, *mongo.Colle

logger := zaptest.NewLogger(t, zaptest.Level(zap.DebugLevel))

port, err := strconv.Atoi(*startupPort)
port, err := strconv.Atoi(*startupPortF)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -152,9 +153,16 @@ func setupListener(t *testing.T, ctx context.Context, logger *zap.Logger) int {

pgPool := testutil.Pool(ctx, t, nil, logger)

proxyAddr := *proxyAddrF
mode := clientconn.NormalMode
if proxyAddr != "" {
mode = clientconn.DiffNormalMode
}

l := clientconn.NewListener(&clientconn.NewListenerOpts{
ListenAddr: "127.0.0.1:0",
Mode: clientconn.NormalMode,
ProxyAddr: proxyAddr,
Mode: mode,
PgPool: pgPool,
Logger: logger,
})
Expand Down Expand Up @@ -183,17 +191,17 @@ func setupListener(t *testing.T, ctx context.Context, logger *zap.Logger) int {
func startup(t *testing.T) {
t.Helper()

*startupPort = strings.ToLower(*startupPort)
switch *startupPort {
*startupPortF = strings.ToLower(*startupPortF)
switch *startupPortF {
case "ferretdb":
*startupPort = "0"
*startupPortF = "0"
case "default":
*startupPort = "27017"
*startupPortF = "27017"
case "mongodb":
*startupPort = "37017"
*startupPortF = "37017"
}

if _, err := strconv.Atoi(*startupPort); err != nil {
if _, err := strconv.Atoi(*startupPortF); err != nil {
t.Fatal(err)
}

Expand Down