From 541740b5d03246f7bd1c3f8a5c95702952554450 Mon Sep 17 00:00:00 2001 From: Hugo Hakim Damer Date: Fri, 8 Mar 2024 05:51:41 +0100 Subject: [PATCH] Fix import cycle in tests --- client/firewall/nftables/manager_linux_test.go | 3 +-- client/firewall/nftables/router_linux_test.go | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/client/firewall/nftables/manager_linux_test.go b/client/firewall/nftables/manager_linux_test.go index 70ecbbe96ba..9029d979a1a 100644 --- a/client/firewall/nftables/manager_linux_test.go +++ b/client/firewall/nftables/manager_linux_test.go @@ -3,7 +3,6 @@ package nftables import ( "context" "fmt" - "github.com/netbirdio/netbird/client/firewall" "net" "net/netip" "testing" @@ -162,7 +161,7 @@ func TestNftablesManager(t *testing.T) { func TestNftablesManager6(t *testing.T) { - if !iface.SupportsIPv6() || !firewall.SupportsIPv6() { + if !iface.SupportsIPv6() { t.Skip("Environment does not support IPv6, skipping IPv6 test...") } mock := &iFaceMock{ diff --git a/client/firewall/nftables/router_linux_test.go b/client/firewall/nftables/router_linux_test.go index 409189a3227..23db1f74ce6 100644 --- a/client/firewall/nftables/router_linux_test.go +++ b/client/firewall/nftables/router_linux_test.go @@ -12,7 +12,6 @@ import ( "github.com/google/nftables/expr" "github.com/stretchr/testify/require" - fw "github.com/netbirdio/netbird/client/firewall" firewall "github.com/netbirdio/netbird/client/firewall/manager" "github.com/netbirdio/netbird/client/firewall/test" ) @@ -282,7 +281,7 @@ func createWorkTables() (*nftables.Table, *nftables.Table, error) { table := sConn.AddTable(&nftables.Table{Name: tableName, Family: nftables.TableFamilyIPv4}) var table6 *nftables.Table - if iface.SupportsIPv6() && fw.SupportsIPv6() { + if iface.SupportsIPv6() { table6 = sConn.AddTable(&nftables.Table{Name: tableName, Family: nftables.TableFamilyIPv6}) } err = sConn.Flush()