Apply code review comments

Author: serathius

server/etcdserver/server_test.go

@@ -97,8 +97,7 @@ func TestApplyRepeat(t *testing.T) {
 		storage:     mockstorage.NewStorageRecorder(""),
 		transport:   newNopTransporter(),
 	})
-	s := newServer(t, nil, testEtcdServerConfig{
-		lg:      zaptest.NewLogger(t),
+	s := newServer(t, nil, &testEtcdServerConfig{
 		r:       r,
 		v2store: st,
 		cluster: cl,
@@ -163,8 +162,7 @@ func TestV2SetMemberAttributes(t *testing.T) {
 		ServerFeatureGate: features.NewDefaultServerFeatureGate("test", nil),
 	}
 
-	srv := newServer(t, nil, testEtcdServerConfig{
-		lg:      zaptest.NewLogger(t),
+	srv := newServer(t, nil, &testEtcdServerConfig{
 		v2store: mockstore.NewRecorder(),
 		cluster: cl,
 		be:      be,
@@ -244,7 +242,7 @@ func TestV2SetClusterVersion(t *testing.T) {
 
 func TestApplyConfStateWithRestart(t *testing.T) {
 	n := newNodeRecorder()
-	srv := newServer(t, n)
+	srv := newServer(t, n, nil)
 	defer srv.Cleanup()
 
 	assert.Equal(t, uint64(0), srv.consistIndex.ConsistentIndex())
@@ -341,10 +339,9 @@ type testEtcdServerConfig struct {
 	cfg     config.ServerConfig
 }
 
-func newServer(t *testing.T, recorder *nodeRecorder, cfgs ...testEtcdServerConfig) *EtcdServer {
-	var cfg testEtcdServerConfig
-	if len(cfgs) > 0 {
-		cfg = cfgs[0]
+func newServer(t *testing.T, recorder *nodeRecorder, cfg *testEtcdServerConfig) *EtcdServer {
+	if cfg == nil {
+		cfg = &testEtcdServerConfig{}
 	}
 	lg := cfg.lg
 	if lg == nil {
@@ -464,8 +461,7 @@ func TestApplyConfChangeError(t *testing.T) {
 	}
 	for i, tt := range tests {
 		n := newNodeRecorder()
-		srv := newServer(t, n, testEtcdServerConfig{
-			lg:      zaptest.NewLogger(t),
+		srv := newServer(t, n, &testEtcdServerConfig{
 			cluster: cl,
 		})
 		_, err := srv.applyConfChange(tt.cc, nil, true)
@@ -502,8 +498,7 @@ func TestApplyConfChangeShouldStop(t *testing.T) {
 		Node:      newNodeNop(),
 		transport: newNopTransporter(),
 	})
-	srv := newServer(t, nil, testEtcdServerConfig{
-		lg:      lg,
+	srv := newServer(t, nil, &testEtcdServerConfig{
 		r:       r,
 		cluster: cl,
 	})
@@ -548,8 +543,7 @@ func TestApplyConfigChangeUpdatesConsistIndex(t *testing.T) {
 	schema.CreateMetaBucket(be.BatchTx())
 
 	ci := cindex.NewConsistentIndex(be)
-	srv := newServer(t, nil, testEtcdServerConfig{
-		lg:      lg,
+	srv := newServer(t, nil, &testEtcdServerConfig{
 		r:       realisticRaftNode(lg, 1, nil),
 		cluster: cl,
 		w:       wait.New(),
@@ -641,8 +635,7 @@ func TestApplyMultiConfChangeShouldStop(t *testing.T) {
 		transport: newNopTransporter(),
 	})
 	ci := cindex.NewFakeConsistentIndex(0)
-	srv := newServer(t, nil, testEtcdServerConfig{
-		lg:      lg,
+	srv := newServer(t, nil, &testEtcdServerConfig{
 		r:       r,
 		cluster: cl,
 		w:       wait.New(),
@@ -691,8 +684,7 @@ func TestSnapshotDisk(t *testing.T) {
 		raftStorage: s,
 		storage:     p,
 	})
-	srv := newServer(t, nil, testEtcdServerConfig{
-		lg:      zaptest.NewLogger(t),
+	srv := newServer(t, nil, &testEtcdServerConfig{
 		r:       r,
 		v2store: st,
 		be:      be,
@@ -814,8 +806,7 @@ func TestSnapshotOrdering(t *testing.T) {
 		ServerFeatureGate:      features.NewDefaultServerFeatureGate("test", lg),
 	}
 
-	s := newServer(t, nil, testEtcdServerConfig{
-		lg:      lg,
+	s := newServer(t, nil, &testEtcdServerConfig{
 		cfg:     cfg,
 		r:       r,
 		v2store: st,
@@ -903,8 +894,7 @@ func TestConcurrentApplyAndSnapshotV3(t *testing.T) {
 		raftStorage: rs,
 	})
 	ci := cindex.NewConsistentIndex(be)
-	s := newServer(t, nil, testEtcdServerConfig{
-		lg: lg,
+	s := newServer(t, nil, &testEtcdServerConfig{
 		cfg: config.ServerConfig{
 			Logger:                 lg,
 			DataDir:                testdir,
@@ -1156,8 +1146,7 @@ func TestUpdateMember(t *testing.T) {
 		storage:     mockstorage.NewStorageRecorder(""),
 		transport:   newNopTransporter(),
 	})
-	s := newServer(t, nil, testEtcdServerConfig{
-		lg:      lg,
+	s := newServer(t, nil, &testEtcdServerConfig{
 		r:       r,
 		v2store: st,
 		cluster: cl,
@@ -1195,8 +1184,7 @@ func TestPublishV3(t *testing.T) {
 	lg := zaptest.NewLogger(t)
 	be, _ := betesting.NewDefaultTmpBackend(t)
 	defer betesting.Close(t, be)
-	srv := newServer(t, nil, testEtcdServerConfig{
-		lg:      lg,
+	srv := newServer(t, nil, &testEtcdServerConfig{
 		cfg:     config.ServerConfig{Logger: lg, TickMs: 1, SnapshotCatchUpEntries: DefaultSnapshotCatchUpEntries, MaxRequestBytes: 1000},
 		r:       newRaftNode(raftNodeConfig{lg: lg, Node: n}),
 		cluster: &membership.RaftCluster{},
@@ -1237,8 +1225,7 @@ func TestPublishV3Stopped(t *testing.T) {
 		Node:      newNodeNop(),
 		transport: newNopTransporter(),
 	})
-	srv := newServer(t, nil, testEtcdServerConfig{
-		lg:      zaptest.NewLogger(t),
+	srv := newServer(t, nil, &testEtcdServerConfig{
 		cfg:     config.ServerConfig{Logger: zaptest.NewLogger(t), TickMs: 1, SnapshotCatchUpEntries: DefaultSnapshotCatchUpEntries},
 		r:       r,
 		cluster: &membership.RaftCluster{},
@@ -1262,8 +1249,7 @@ func TestPublishV3Retry(t *testing.T) {
 	lg := zaptest.NewLogger(t)
 	be, _ := betesting.NewDefaultTmpBackend(t)
 	defer betesting.Close(t, be)
-	srv := newServer(t, nil, testEtcdServerConfig{
-		lg:      lg,
+	srv := newServer(t, nil, &testEtcdServerConfig{
 		cfg:     config.ServerConfig{Logger: lg, TickMs: 1, SnapshotCatchUpEntries: DefaultSnapshotCatchUpEntries, MaxRequestBytes: 1000},
 		r:       newRaftNode(raftNodeConfig{lg: lg, Node: n}),
 		cluster: &membership.RaftCluster{},
@@ -1312,8 +1298,7 @@ func TestUpdateVersionV3(t *testing.T) {
 	lg := zaptest.NewLogger(t)
 	be, _ := betesting.NewDefaultTmpBackend(t)
 	defer betesting.Close(t, be)
-	srv := newServer(t, nil, testEtcdServerConfig{
-		lg:      lg,
+	srv := newServer(t, nil, &testEtcdServerConfig{
 		cfg:     config.ServerConfig{Logger: lg, TickMs: 1, SnapshotCatchUpEntries: DefaultSnapshotCatchUpEntries, MaxRequestBytes: 1000},
 		r:       newRaftNode(raftNodeConfig{lg: zaptest.NewLogger(t), Node: n}),
 		cluster: &membership.RaftCluster{},