extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-08-17 10:31:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix parameters of tests

Browse Source
This commit is contained in:
Zoltán Papp
2024-07-08 17:01:11 +02:00
parent 75f5b75bc4
commit 1f949f8cee
7 changed files with 76 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
relay/client/client_test.go
View File

@ -9,11 +9,20 @@ import (
log "github.com/sirupsen/logrus"
"github.com/netbirdio/netbird/relay/auth"
"github.com/netbirdio/netbird/relay/auth/hmac"
"github.com/netbirdio/netbird/util"
"github.com/netbirdio/netbird/relay/server"
)
var (
av = &auth.AllowAllAuth{}
hmacTokenStore = &hmac.TokenStore{}
serverListenAddr = "localhost:1234"
serverURL = "rel://localhost:1234"
)
func TestMain(m *testing.M) {
_ = util.InitLog("trace", "console")
code := m.Run()
@ -23,8 +32,8 @@ func TestMain(m *testing.M) {
func TestClient(t *testing.T) {
ctx := context.Background()
srvCfg := server.ListenerConfig{Address: "localhost:1234"}
srv := server.NewServer(srvCfg.Address, false)
srvCfg := server.ListenerConfig{Address: serverListenAddr}
srv := server.NewServer(serverURL, false, av)
go func() {
err := srv.Listen(srvCfg)
if err != nil {
@ -39,21 +48,21 @@ func TestClient(t *testing.T) {
}
}()
clientAlice := NewClient(ctx, srvCfg.Address, "alice")
clientAlice := NewClient(ctx, serverURL, hmacTokenStore, "alice")
err := clientAlice.Connect()
if err != nil {
t.Fatalf("failed to connect to server: %s", err)
}
defer clientAlice.Close()
clientPlaceHolder := NewClient(ctx, srvCfg.Address, "clientPlaceHolder")
clientPlaceHolder := NewClient(ctx, serverURL, hmacTokenStore, "clientPlaceHolder")
err = clientPlaceHolder.Connect()
if err != nil {
t.Fatalf("failed to connect to server: %s", err)
}
defer clientPlaceHolder.Close()
clientBob := NewClient(ctx, srvCfg.Address, "bob")
clientBob := NewClient(ctx, serverURL, hmacTokenStore, "bob")
err = clientBob.Connect()
if err != nil {
t.Fatalf("failed to connect to server: %s", err)
@ -91,8 +100,8 @@ func TestClient(t *testing.T) {
func TestRegistration(t *testing.T) {
ctx := context.Background()
srvCfg := server.ListenerConfig{Address: "localhost:1234"}
srv := server.NewServer(srvCfg.Address, false)
srvCfg := server.ListenerConfig{Address: serverListenAddr}
srv := server.NewServer(serverURL, false, av)
go func() {
err := srv.Listen(srvCfg)
if err != nil {
@ -100,7 +109,7 @@ func TestRegistration(t *testing.T) {
}
}()
clientAlice := NewClient(ctx, srvCfg.Address, "alice")
clientAlice := NewClient(ctx, serverURL, hmacTokenStore, "alice")
err := clientAlice.Connect()
if err != nil {
_ = srv.Close()
@ -140,7 +149,7 @@ func TestRegistrationTimeout(t *testing.T) {
_ = fakeTCPListener.Close()
}(fakeTCPListener)
clientAlice := NewClient(ctx, "127.0.0.1:1234", "alice")
clientAlice := NewClient(ctx, "127.0.0.1:1234", hmacTokenStore, "alice")
err = clientAlice.Connect()
if err == nil {
t.Errorf("failed to connect to server: %s", err)
@ -156,8 +165,8 @@ func TestEcho(t *testing.T) {
ctx := context.Background()
idAlice := "alice"
idBob := "bob"
srvCfg := server.ListenerConfig{Address: "localhost:1234"}
srv := server.NewServer(srvCfg.Address, false)
srvCfg := server.ListenerConfig{Address: serverListenAddr}
srv := server.NewServer(serverURL, false, av)
go func() {
err := srv.Listen(srvCfg)
if err != nil {
@ -172,7 +181,7 @@ func TestEcho(t *testing.T) {
}
}()
clientAlice := NewClient(ctx, srvCfg.Address, idAlice)
clientAlice := NewClient(ctx, serverURL, hmacTokenStore, idAlice)
err := clientAlice.Connect()
if err != nil {
t.Fatalf("failed to connect to server: %s", err)
@ -184,7 +193,7 @@ func TestEcho(t *testing.T) {
}
}()
clientBob := NewClient(ctx, srvCfg.Address, idBob)
clientBob := NewClient(ctx, serverURL, hmacTokenStore, idBob)
err = clientBob.Connect()
if err != nil {
t.Fatalf("failed to connect to server: %s", err)
@ -236,8 +245,8 @@ func TestEcho(t *testing.T) {
func TestBindToUnavailabePeer(t *testing.T) {
ctx := context.Background()
srvCfg := server.ListenerConfig{Address: "localhost:1234"}
srv := server.NewServer(srvCfg.Address, false)
srvCfg := server.ListenerConfig{Address: serverListenAddr}
srv := server.NewServer(serverURL, false, av)
go func() {
err := srv.Listen(srvCfg)
if err != nil {
@ -253,7 +262,7 @@ func TestBindToUnavailabePeer(t *testing.T) {
}
}()
clientAlice := NewClient(ctx, srvCfg.Address, "alice")
clientAlice := NewClient(ctx, serverURL, hmacTokenStore, "alice")
err := clientAlice.Connect()
if err != nil {
t.Errorf("failed to connect to server: %s", err)
@ -273,8 +282,8 @@ func TestBindToUnavailabePeer(t *testing.T) {
func TestBindReconnect(t *testing.T) {
ctx := context.Background()
srvCfg := server.ListenerConfig{Address: "localhost:1234"}
srv := server.NewServer(srvCfg.Address, false)
srvCfg := server.ListenerConfig{Address: serverListenAddr}
srv := server.NewServer(serverURL, false, av)
go func() {
err := srv.Listen(srvCfg)
if err != nil {
@ -290,7 +299,7 @@ func TestBindReconnect(t *testing.T) {
}
}()
clientAlice := NewClient(ctx, srvCfg.Address, "alice")
clientAlice := NewClient(ctx, serverURL, hmacTokenStore, "alice")
err := clientAlice.Connect()
if err != nil {
t.Errorf("failed to connect to server: %s", err)
@ -301,7 +310,7 @@ func TestBindReconnect(t *testing.T) {
t.Errorf("failed to bind channel: %s", err)
}
clientBob := NewClient(ctx, srvCfg.Address, "bob")
clientBob := NewClient(ctx, serverURL, hmacTokenStore, "bob")
err = clientBob.Connect()
if err != nil {
t.Errorf("failed to connect to server: %s", err)
@ -318,7 +327,7 @@ func TestBindReconnect(t *testing.T) {
t.Errorf("failed to close client: %s", err)
}
clientAlice = NewClient(ctx, srvCfg.Address, "alice")
clientAlice = NewClient(ctx, serverURL, hmacTokenStore, "alice")
err = clientAlice.Connect()
if err != nil {
t.Errorf("failed to connect to server: %s", err)
@ -355,8 +364,8 @@ func TestBindReconnect(t *testing.T) {
func TestCloseConn(t *testing.T) {
ctx := context.Background()
srvCfg := server.ListenerConfig{Address: "localhost:1234"}
srv := server.NewServer(srvCfg.Address, false)
srvCfg := server.ListenerConfig{Address: serverListenAddr}
srv := server.NewServer(serverURL, false, av)
go func() {
err := srv.Listen(srvCfg)
if err != nil {
@ -372,7 +381,7 @@ func TestCloseConn(t *testing.T) {
}
}()
clientAlice := NewClient(ctx, srvCfg.Address, "alice")
clientAlice := NewClient(ctx, serverURL, hmacTokenStore, "alice")
err := clientAlice.Connect()
if err != nil {
t.Errorf("failed to connect to server: %s", err)
@ -403,8 +412,8 @@ func TestCloseConn(t *testing.T) {
func TestCloseRelayConn(t *testing.T) {
ctx := context.Background()
srvCfg := server.ListenerConfig{Address: "localhost:1234"}
srv := server.NewServer(srvCfg.Address, false)
srvCfg := server.ListenerConfig{Address: serverListenAddr}
srv := server.NewServer(serverURL, false, av)
go func() {
err := srv.Listen(srvCfg)
if err != nil {
@ -419,7 +428,7 @@ func TestCloseRelayConn(t *testing.T) {
}
}()
clientAlice := NewClient(ctx, srvCfg.Address, "alice")
clientAlice := NewClient(ctx, serverURL, hmacTokenStore, "alice")
err := clientAlice.Connect()
if err != nil {
t.Fatalf("failed to connect to server: %s", err)
@ -446,8 +455,8 @@ func TestCloseRelayConn(t *testing.T) {
func TestCloseByServer(t *testing.T) {
ctx := context.Background()
srvCfg := server.ListenerConfig{Address: "localhost:1234"}
srv1 := server.NewServer(srvCfg.Address, false)
srvCfg := server.ListenerConfig{Address: serverListenAddr}
srv1 := server.NewServer(serverURL, false, av)
go func() {
err := srv1.Listen(srvCfg)
if err != nil {
@ -457,7 +466,7 @@ func TestCloseByServer(t *testing.T) {
idAlice := "alice"
log.Debugf("connect by alice")
relayClient := NewClient(ctx, srvCfg.Address, idAlice)
relayClient := NewClient(ctx, serverURL, hmacTokenStore, idAlice)
err := relayClient.Connect()
if err != nil {
log.Fatalf("failed to connect to server: %s", err)
@ -489,8 +498,8 @@ func TestCloseByServer(t *testing.T) {
func TestCloseByClient(t *testing.T) {
ctx := context.Background()
srvCfg := server.ListenerConfig{Address: "localhost:1234"}
srv := server.NewServer(srvCfg.Address, false)
srvCfg := server.ListenerConfig{Address: serverListenAddr}
srv := server.NewServer(serverURL, false, av)
go func() {
err := srv.Listen(srvCfg)
if err != nil {
@ -500,7 +509,7 @@ func TestCloseByClient(t *testing.T) {
idAlice := "alice"
log.Debugf("connect by alice")
relayClient := NewClient(ctx, srvCfg.Address, idAlice)
relayClient := NewClient(ctx, serverURL, hmacTokenStore, idAlice)
err := relayClient.Connect()
if err != nil {
log.Fatalf("failed to connect to server: %s", err)