From 49c0aeb6ce2f9cd91f9cf30402f5955ba6677865 Mon Sep 17 00:00:00 2001 From: Zoltan Papp Date: Wed, 1 Jul 2026 17:00:20 +0200 Subject: [PATCH] [relay] Update relay client tests for the new OpenConn signature Manager.OpenConn now takes a RelayServer struct and a preferForeign flag instead of a server address string and a serverIP. Adjust the manager tests accordingly: bundle addr/IP into RelayServer and set preferForeign=true for foreign-relay dials, false for home-relay dials. --- shared/relay/client/manager_serverip_test.go | 7 +++---- shared/relay/client/manager_test.go | 15 +++++++-------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/shared/relay/client/manager_serverip_test.go b/shared/relay/client/manager_serverip_test.go index a354beade..84d71764c 100644 --- a/shared/relay/client/manager_serverip_test.go +++ b/shared/relay/client/manager_serverip_test.go @@ -3,7 +3,6 @@ package client import ( "context" "io" - "net/netip" "testing" "time" @@ -85,7 +84,7 @@ func TestManager_ForeignRelayServerIP(t *testing.T) { t.Run("no server IP, dial fails", func(t *testing.T) { dialCtx, dialCancel := context.WithTimeout(ctx, 5*time.Second) defer dialCancel() - _, err := mgrAlice.OpenConn(dialCtx, brokenFQDN, "bob", netip.Addr{}) + _, err := mgrAlice.OpenConn(dialCtx, RelayServer{Addr: brokenFQDN}, "bob", true) if err == nil { t.Fatalf("expected OpenConn to fail without server IP, got success") } @@ -95,7 +94,7 @@ func TestManager_ForeignRelayServerIP(t *testing.T) { // Bob waits for Alice's incoming peer connection on his side. bobSideCh := make(chan error, 1) go func() { - conn, err := mgrBob.OpenConn(ctx, bobRealAddr, "alice", netip.Addr{}) + conn, err := mgrBob.OpenConn(ctx, RelayServer{Addr: bobRealAddr}, "alice", false) if err != nil { bobSideCh <- err return @@ -113,7 +112,7 @@ func TestManager_ForeignRelayServerIP(t *testing.T) { bobSideCh <- nil }() - aliceConn, err := mgrAlice.OpenConn(ctx, brokenFQDN, "bob", bobAdvertisedIP) + aliceConn, err := mgrAlice.OpenConn(ctx, RelayServer{Addr: brokenFQDN, IP: bobAdvertisedIP}, "bob", true) if err != nil { t.Fatalf("alice OpenConn with server IP: %s", err) } diff --git a/shared/relay/client/manager_test.go b/shared/relay/client/manager_test.go index 9e964f688..b7c4f44ee 100644 --- a/shared/relay/client/manager_test.go +++ b/shared/relay/client/manager_test.go @@ -3,7 +3,6 @@ package client import ( "context" "fmt" - "net/netip" "testing" "time" @@ -106,11 +105,11 @@ func TestForeignConn(t *testing.T) { if err != nil { t.Fatalf("failed to get relay address: %s", err) } - connAliceToBob, err := clientAlice.OpenConn(ctx, bobsSrvAddr, "bob", netip.Addr{}) + connAliceToBob, err := clientAlice.OpenConn(ctx, RelayServer{Addr: bobsSrvAddr}, "bob", true) if err != nil { t.Fatalf("failed to bind channel: %s", err) } - connBobToAlice, err := clientBob.OpenConn(ctx, bobsSrvAddr, "alice", netip.Addr{}) + connBobToAlice, err := clientBob.OpenConn(ctx, RelayServer{Addr: bobsSrvAddr}, "alice", false) if err != nil { t.Fatalf("failed to bind channel: %s", err) } @@ -210,7 +209,7 @@ func TestForeginConnClose(t *testing.T) { if err != nil { t.Fatalf("failed to serve manager: %s", err) } - conn, err := mgr.OpenConn(ctx, toURL(srvCfg2)[0], "bob", netip.Addr{}) + conn, err := mgr.OpenConn(ctx, RelayServer{Addr: toURL(srvCfg2)[0]}, "bob", true) if err != nil { t.Fatalf("failed to bind channel: %s", err) } @@ -302,7 +301,7 @@ func TestForeignAutoClose(t *testing.T) { } t.Log("open connection to another peer") - if _, err = mgr.OpenConn(ctx, foreignServerURL, "anotherpeer", netip.Addr{}); err == nil { + if _, err = mgr.OpenConn(ctx, RelayServer{Addr: foreignServerURL}, "anotherpeer", true); err == nil { t.Fatalf("should have failed to open connection to another peer") } @@ -372,7 +371,7 @@ func TestAutoReconnect(t *testing.T) { if err != nil { t.Errorf("failed to get relay address: %s", err) } - conn, err := clientAlice.OpenConn(ctx, ra, "bob", netip.Addr{}) + conn, err := clientAlice.OpenConn(ctx, RelayServer{Addr: ra}, "bob", false) if err != nil { t.Errorf("failed to bind channel: %s", err) } @@ -392,7 +391,7 @@ func TestAutoReconnect(t *testing.T) { } log.Infof("reopent the connection") - _, err = clientAlice.OpenConn(ctx, ra, "bob", netip.Addr{}) + _, err = clientAlice.OpenConn(ctx, RelayServer{Addr: ra}, "bob", false) if err != nil { t.Errorf("failed to open channel: %s", err) } @@ -454,7 +453,7 @@ func TestNotifierDoubleAdd(t *testing.T) { t.Fatalf("failed to serve manager: %s", err) } - conn1, err := clientAlice.OpenConn(ctx, clientAlice.ServerURLs()[0], "bob", netip.Addr{}) + conn1, err := clientAlice.OpenConn(ctx, RelayServer{Addr: clientAlice.ServerURLs()[0]}, "bob", false) if err != nil { t.Fatalf("failed to bind channel: %s", err) }