From 5eb677f5b91d2664094d759b4b07c64c1889c57b Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Fri, 14 Feb 2025 17:21:35 +0300 Subject: [PATCH] client: fix test --- internal/client/storage_test.go | 60 ++++++++++++++++----------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/internal/client/storage_test.go b/internal/client/storage_test.go index 4952198e..eb69b9fe 100644 --- a/internal/client/storage_test.go +++ b/internal/client/storage_test.go @@ -425,6 +425,36 @@ func TestClientsDHCP(t *testing.T) { return storage.Shutdown(testutil.ContextWithTimeout(t, testTimeout)) }) + require.True(t, t.Run("find_runtime_lower_priority", func(t *testing.T) { + // Add a lower-priority client. + ns := []arpdb.Neighbor{{ + Name: cliName1, + IP: cliIP1, + }} + + testutil.RequireSend(t, arpCh, ns, testTimeout) + + storage.ReloadARP(testutil.ContextWithTimeout(t, testTimeout)) + + cli1 := storage.ClientRuntime(cliIP1) + require.NotNil(t, cli1) + + assert.True(t, compareRuntimeInfo(cli1, client.SourceDHCP, cliName1)) + + // Remove the matching client. + // + // TODO(a.garipov): Consider adding ways of explicitly clearing runtime + // sources by source. + ns = []arpdb.Neighbor{{ + Name: otherARPCliName, + IP: otherARPCliIP, + }} + + testutil.RequireSend(t, arpCh, ns, testTimeout) + + storage.ReloadARP(testutil.ContextWithTimeout(t, testTimeout)) + })) + require.True(t, t.Run("find_runtime", func(t *testing.T) { cli1 := storage.ClientRuntime(cliIP1) require.NotNil(t, cli1) @@ -474,36 +504,6 @@ func TestClientsDHCP(t *testing.T) { }, testTimeout, testTimeout/10) })) - require.True(t, t.Run("find_runtime_lower_priority", func(t *testing.T) { - // Add a lower-priority client. - ns := []arpdb.Neighbor{{ - Name: cliName1, - IP: cliIP1, - }} - - testutil.RequireSend(t, arpCh, ns, testTimeout) - - storage.ReloadARP(testutil.ContextWithTimeout(t, testTimeout)) - - cli1 := storage.ClientRuntime(cliIP1) - require.NotNil(t, cli1) - - assert.True(t, compareRuntimeInfo(cli1, client.SourceDHCP, cliName1)) - - // Remove the matching client. - // - // TODO(a.garipov): Consider adding ways of explicitly clearing runtime - // sources by source. - ns = []arpdb.Neighbor{{ - Name: otherARPCliName, - IP: otherARPCliIP, - }} - - testutil.RequireSend(t, arpCh, ns, testTimeout) - - storage.ReloadARP(testutil.ContextWithTimeout(t, testTimeout)) - })) - require.True(t, t.Run("find_persistent", func(t *testing.T) { err = storage.Add(ctx, &client.Persistent{ Name: prsCliName,