From ca6b3b55244b5721419efc51673bdd2507c7269c Mon Sep 17 00:00:00 2001 From: Travis Turner Date: Tue, 19 Jun 2018 17:48:37 -0500 Subject: [PATCH] simplify test cluter addNode signature --- cluster_internal_test.go | 20 ++++++++++---------- utils_internal_test.go | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cluster_internal_test.go b/cluster_internal_test.go index 8840c9dbb..c6c770232 100644 --- a/cluster_internal_test.go +++ b/cluster_internal_test.go @@ -552,7 +552,7 @@ func TestCluster_ResizeStates(t *testing.T) { t.Run("Single node, in topology", func(t *testing.T) { tc := NewClusterCluster(0) - tc.addNode(false) + tc.addNode() node := tc.Clusters[0] @@ -580,7 +580,7 @@ func TestCluster_ResizeStates(t *testing.T) { t.Run("Single node, not in topology", func(t *testing.T) { tc := NewClusterCluster(0) - tc.addNode(false) + tc.addNode() node := tc.Clusters[0] @@ -605,14 +605,14 @@ func TestCluster_ResizeStates(t *testing.T) { t.Run("Multiple nodes, no data", func(t *testing.T) { tc := NewClusterCluster(0) - tc.addNode(false) + tc.addNode() // Open TestCluster. if err := tc.Open(); err != nil { t.Fatal(err) } - tc.addNode(false) + tc.addNode() node0 := tc.Clusters[0] node1 := tc.Clusters[1] @@ -643,7 +643,7 @@ func TestCluster_ResizeStates(t *testing.T) { t.Run("Multiple nodes, in/not in topology", func(t *testing.T) { tc := NewClusterCluster(0) - tc.addNode(false) + tc.addNode() node0 := tc.Clusters[0] // write topology to data file @@ -664,12 +664,12 @@ func TestCluster_ResizeStates(t *testing.T) { // Expect an error by adding a node not in the topology. expectedError := "host is not in topology: node1" - err := tc.addNode(false) + err := tc.addNode() if err == nil || err.Error() != expectedError { t.Errorf("did not receive expected error: %s", expectedError) } - tc.addNode(false) + tc.addNode() node2 := tc.Clusters[2] // Ensure that node comes up in state NORMAL. @@ -687,7 +687,7 @@ func TestCluster_ResizeStates(t *testing.T) { t.Run("Multiple nodes, with data", func(t *testing.T) { tc := NewClusterCluster(0) - tc.addNode(false) + tc.addNode() node0 := tc.Clusters[0] // Open TestCluster. @@ -709,8 +709,8 @@ func TestCluster_ResizeStates(t *testing.T) { node0Fragment := node0View.Fragment(1) node0Checksum := node0Fragment.Checksum() - // AddNode needs to block until the resize process has completed. - tc.addNode(false) + // addNode needs to block until the resize process has completed. + tc.addNode() node1 := tc.Clusters[1] // Ensure that nodes come up in state NORMAL. diff --git a/utils_internal_test.go b/utils_internal_test.go index d1b49db03..f120019b9 100644 --- a/utils_internal_test.go +++ b/utils_internal_test.go @@ -150,11 +150,11 @@ func (t *ClusterCluster) clusterByID(id string) *Cluster { return nil } -// AddNode adds a node to the cluster and (potentially) starts a resize job. -func (t *ClusterCluster) addNode(saveTopology bool) error { +// addNode adds a node to the cluster and (potentially) starts a resize job. +func (t *ClusterCluster) addNode() error { id := len(t.Clusters) - c, err := t.addCluster(id, saveTopology) + c, err := t.addCluster(id, false) if err != nil { return err }