From 163ac48ce423ae3650ed5baa1b54fbfcaefb22e2 Mon Sep 17 00:00:00 2001 From: Quentin McGaw Date: Mon, 29 May 2023 05:54:01 +0000 Subject: [PATCH] chore(wireguard): fix netlink integration test - Broken since recent commit 9d1a0b60a29cc03e252d0e350c44ab21cf5399ba --- .../wireguard/netlink_integration_test.go | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/internal/wireguard/netlink_integration_test.go b/internal/wireguard/netlink_integration_test.go index 3e2cc0c4..f3ecdb42 100644 --- a/internal/wireguard/netlink_integration_test.go +++ b/internal/wireguard/netlink_integration_test.go @@ -57,24 +57,22 @@ func Test_netlink_Wireguard_addAddresses(t *testing.T) { }, } - // Success - err = wg.addAddresses(link, addresses) - require.NoError(t, err) + const addIterations = 2 // initial + replace - netlinkAddresses, err := netlinker.AddrList(link, netlink.FAMILY_ALL) - require.NoError(t, err) - require.Equal(t, len(addresses), len(netlinkAddresses)) - for i, netlinkAddress := range netlinkAddresses { - require.NotNil(t, netlinkAddress.IPNet) - ipNet, err := netip.ParsePrefix(netlinkAddress.IPNet.String()) + for i := 0; i < addIterations; i++ { + err = wg.addAddresses(link, addresses) require.NoError(t, err) - assert.Equal(t, addresses[i], ipNet) - } - // Existing address cannot be added - err = wg.addAddresses(link, addresses) - require.Error(t, err) - assert.EqualError(t, err, "file exists: when adding address 1.2.3.4/32 to link test_8081") + netlinkAddresses, err := netlinker.AddrList(link, netlink.FAMILY_ALL) + require.NoError(t, err) + require.Equal(t, len(addresses), len(netlinkAddresses)) + for i, netlinkAddress := range netlinkAddresses { + require.NotNil(t, netlinkAddress.IPNet) + ipNet, err := netip.ParsePrefix(netlinkAddress.IPNet.String()) + require.NoError(t, err) + assert.Equal(t, addresses[i], ipNet) + } + } } func Test_netlink_Wireguard_addRule(t *testing.T) {