From 2803e1669be1227134c733061b86431f7368b668 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Papp?= Date: Mon, 8 Jul 2024 17:24:49 +0200 Subject: [PATCH] Remove meaningless tests --- client/internal/peer/conn_test.go | 49 -------------------------- relay/test/manager_test.go | 57 ------------------------------- 2 files changed, 106 deletions(-) delete mode 100644 relay/test/manager_test.go diff --git a/client/internal/peer/conn_test.go b/client/internal/peer/conn_test.go index 7caef01bf..59f249b82 100644 --- a/client/internal/peer/conn_test.go +++ b/client/internal/peer/conn_test.go @@ -8,12 +8,10 @@ import ( "time" "github.com/magiconair/properties/assert" - log "github.com/sirupsen/logrus" "github.com/netbirdio/netbird/client/internal/stdnet" "github.com/netbirdio/netbird/client/internal/wgproxy" "github.com/netbirdio/netbird/iface" - relayClient "github.com/netbirdio/netbird/relay/client" "github.com/netbirdio/netbird/util" ) @@ -168,50 +166,3 @@ func TestConn_Status(t *testing.T) { }) } } - -func TestConn_Switch(t *testing.T) { - ctx := context.Background() - - wgProxyFactory := wgproxy.NewFactory(ctx, false, connConf.LocalWgPort) - connConfAlice := ConnConfig{ - Key: "LLHf3Ma6z6mdLbriAJbqhX7+nM/B71lgw2+91q3LfhU=", - LocalKey: "RRHf3Ma6z6mdLbriAJbqhX7+nM/B71lgw2+91q3LfhU=", - Timeout: time.Second, - LocalWgPort: 51820, - ICEConfig: ICEConfig{ - InterfaceBlackList: nil, - }, - WgConfig: WgConfig{ - WgListenPort: 51820, - RemoteKey: "LLHf3Ma6z6mdLbriAJbqhX7+nM/B71lgw2+91q3LfhU=", - AllowedIps: "172.16.254.0/16", - }, - } - relayManagerAlice := relayClient.NewManager(ctx, "127.0.0.1:1234", connConf.LocalKey) - connAlice, err := NewConn(ctx, connConfAlice, NewRecorder("https://mgm"), wgProxyFactory, nil, nil, relayManagerAlice) - if err != nil { - log.Fatalf("failed to create conn: %v", err) - } - connAlice.Open() - - connConfbob := ConnConfig{ - Key: "RRHf3Ma6z6mdLbriAJbqhX7+nM/B71lgw2+91q3LfhU=", - LocalKey: "LLHf3Ma6z6mdLbriAJbqhX7+nM/B71lgw2+91q3LfhU=", - Timeout: time.Second, - LocalWgPort: 51820, - ICEConfig: ICEConfig{ - InterfaceBlackList: nil, - }, - WgConfig: WgConfig{ - WgListenPort: 51820, - RemoteKey: "RRHf3Ma6z6mdLbriAJbqhX7+nM/B71lgw2+91q3LfhU=", - AllowedIps: "172.16.254.0/16", - }, - } - relayManagerBob := relayClient.NewManager(ctx, "127.0.0.1:1234", connConf.LocalKey) - connBob, err := NewConn(ctx, connConfbob, NewRecorder("https://mgm"), wgProxyFactory, nil, nil, relayManagerBob) - if err != nil { - log.Fatalf("failed to create conn: %v", err) - } - connBob.Open() -} diff --git a/relay/test/manager_test.go b/relay/test/manager_test.go deleted file mode 100644 index 09edeff84..000000000 --- a/relay/test/manager_test.go +++ /dev/null @@ -1,57 +0,0 @@ -package test - -import ( - "context" - "testing" - "time" - - "github.com/netbirdio/netbird/relay/client" - "github.com/netbirdio/netbird/relay/server" -) - -func TestManager(t *testing.T) { - addr := "localhost:1239" - - srv := server.NewServer() - go func() { - err := srv.Listen(addr) - if err != nil { - t.Fatalf("failed to bind server: %s", err) - } - }() - - defer func() { - err := srv.Close() - if err != nil { - t.Errorf("failed to close server: %s", err) - } - }() - ctx, cancel := context.WithCancel(context.Background()) - defer cancel() - - cm := client.NewManager(ctx, addr, "me") - cm.Serve() - - // wait for the relay handshake to complete - time.Sleep(1 * time.Second) - conn, err := cm.OpenConn("remotepeer") - if err != nil { - t.Errorf("failed to open connection: %s", err) - } - - readCtx, readCancel := context.WithCancel(context.Background()) - defer readCancel() - go func() { - _, _ = conn.Read(make([]byte, 1)) - readCancel() - }() - - cancel() - - select { - case <-time.After(2 * time.Second): - t.Errorf("client peer conn did not close automatically") - case <-readCtx.Done(): - // conn exited well - } -}