From 41c48dc678dd84df95c2ffb352f1ee138313eb77 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Sun, 9 Sep 2018 20:43:42 +0000 Subject: [PATCH] Update test to call reclaimPeer() --- prog/kube-utils/peerlist_test.go | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/prog/kube-utils/peerlist_test.go b/prog/kube-utils/peerlist_test.go index 84d4e7d8..0a523494 100644 --- a/prog/kube-utils/peerlist_test.go +++ b/prog/kube-utils/peerlist_test.go @@ -131,19 +131,17 @@ func TestPeerListFuzz(t *testing.T) { // remove from Kubernetes first, then from test state cml := newConfigMapAnnotations(configMapNamespace, configMapName, c) - err := cml.Init() - require.NoError(t, err) + require.NoError(t, cml.Init()) storedPeerList, err := cml.GetPeerList() require.NoError(t, err) found := storedPeerList.contains(peerName(i)) - require.Equal(t, true, found, "peer %d not found in stored list", i) - if !found { - return - } - storedPeerList.remove(peerName(i)) - err = cml.UpdatePeerList(*storedPeerList) + require.True(t, found, "peer %d not found in stored list", i) + + _, err = reclaimPeer(mockWeave{}, cml, peerName(i), fmt.Sprintf("deleter-%d", i)) require.NoError(t, err) + storedPeerList, err = cml.GetPeerList() + require.NoError(t, err) stateLock.Lock() delete(nodeMap, i) for pos = 0; pos < len(nodes); pos++ { @@ -175,3 +173,9 @@ func TestPeerListFuzz(t *testing.T) { require.NoError(t, err) require.Equal(t, len(storedPeerList.Peers), len(nodes)) } + +type mockWeave struct{} + +func (mockWeave) RmPeer(peerName string) (string, error) { + return "", nil +}