Fix tests

netbirdio · Oct 9, 2024 · 021eef5 · 021eef5
1 parent 0ef7e76
commit 021eef5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 22 deletions.
diff --git a/client/iface/iface_moc.go b/client/iface/iface_moc.go
@@ -9,6 +9,7 @@ import (
  "github.com/netbirdio/netbird/client/iface/bind"
  "github.com/netbirdio/netbird/client/iface/configurer"
  "github.com/netbirdio/netbird/client/iface/device"
+ "github.com/netbirdio/netbird/client/iface/wgproxy"
 )
 
 type MockWGIface struct {
@@ -30,6 +31,7 @@ type MockWGIface struct {
  GetDeviceFunc func() *device.FilteredDevice
  GetStatsFunc func(peerKey string) (configurer.WGStats, error)
  GetInterfaceGUIDStringFunc func() (string, error)
+ GetProxyFunc func() wgproxy.Proxy
 }
 
 func (m *MockWGIface) GetInterfaceGUIDString() (string, error) {
@@ -103,3 +105,8 @@ func (m *MockWGIface) GetDevice() *device.FilteredDevice {
 func (m *MockWGIface) GetStats(peerKey string) (configurer.WGStats, error) {
  return m.GetStatsFunc(peerKey)
 }
+
+func (m *MockWGIface) GetProxy() wgproxy.Proxy {
+ //TODO implement me
+ panic("implement me")
+}
diff --git a/client/iface/wgproxy/proxy_test.go b/client/iface/wgproxy/proxy_test.go
@@ -12,6 +12,7 @@ import (
  "time"
 
  "github.com/netbirdio/netbird/client/iface/wgproxy/ebpf"
+ udpProxy "github.com/netbirdio/netbird/client/iface/wgproxy/udp"
  "github.com/netbirdio/netbird/util"
 )
 
@@ -83,7 +84,7 @@ func TestProxyCloseByRemoteConn(t *testing.T) {
  }{
  {
  name: "userspace proxy",
- proxy: udpproxy.NewWGUserSpaceProxy(51830),
+ proxy: udpProxy.NewWGUDPProxy(51830),
  },
  }
 

diff --git a/client/internal/peer/conn_test.go b/client/internal/peer/conn_test.go
@@ -11,7 +11,6 @@ import (
 
  "github.com/netbirdio/netbird/client/iface"
  "github.com/netbirdio/netbird/client/internal/stdnet"
- "github.com/netbirdio/netbird/client/internal/wgproxy"
  "github.com/netbirdio/netbird/util"
 )
 
@@ -44,11 +43,7 @@ func TestNewConn_interfaceFilter(t *testing.T) {
 }
 
 func TestConn_GetKey(t *testing.T) {
- wgProxyFactory := wgproxy.NewFactory(false, connConf.LocalWgPort)
- defer func() {
- _ = wgProxyFactory.Free()
- }()
- conn, err := NewConn(context.Background(), connConf, nil, wgProxyFactory, nil, nil, nil)
+ conn, err := NewConn(context.Background(), connConf, nil, nil, nil, nil)
  if err != nil {
  return
  }
@@ -59,11 +54,7 @@ func TestConn_GetKey(t *testing.T) {
 }
 
 func TestConn_OnRemoteOffer(t *testing.T) {
- wgProxyFactory := wgproxy.NewFactory(false, connConf.LocalWgPort)
- defer func() {
- _ = wgProxyFactory.Free()
- }()
- conn, err := NewConn(context.Background(), connConf, NewRecorder("https://mgm"), wgProxyFactory, nil, nil, nil)
+ conn, err := NewConn(context.Background(), connConf, NewRecorder("https://mgm"), nil, nil, nil)
  if err != nil {
  return
  }
@@ -96,11 +87,7 @@ func TestConn_OnRemoteOffer(t *testing.T) {
 }
 
 func TestConn_OnRemoteAnswer(t *testing.T) {
- wgProxyFactory := wgproxy.NewFactory(false, connConf.LocalWgPort)
- defer func() {
- _ = wgProxyFactory.Free()
- }()
- conn, err := NewConn(context.Background(), connConf, NewRecorder("https://mgm"), wgProxyFactory, nil, nil, nil)
+ conn, err := NewConn(context.Background(), connConf, NewRecorder("https://mgm"), nil, nil, nil)
  if err != nil {
  return
  }
@@ -132,11 +119,7 @@ func TestConn_OnRemoteAnswer(t *testing.T) {
  wg.Wait()
 }
 func TestConn_Status(t *testing.T) {
- wgProxyFactory := wgproxy.NewFactory(false, connConf.LocalWgPort)
- defer func() {
- _ = wgProxyFactory.Free()
- }()
- conn, err := NewConn(context.Background(), connConf, NewRecorder("https://mgm"), wgProxyFactory, nil, nil, nil)
+ conn, err := NewConn(context.Background(), connConf, NewRecorder("https://mgm"), nil, nil, nil)
  if err != nil {
  return
  }