Fix merge change

hashicorp · Mar 12, 2018 · 89845b3 · 89845b3
1 parent 748f8a4
commit 89845b3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/nomad/heartbeat_test.go b/nomad/heartbeat_test.go
@@ -64,7 +64,7 @@ func TestHeartbeat_ResetHeartbeatTimer(t *testing.T) {
 func TestHeartbeat_ResetHeartbeatTimer_Nonleader(t *testing.T) {
 	t.Parallel()
 	require := require.New(t)
-	s1 := testServer(t, func(c *Config) {
+	s1 := TestServer(t, func(c *Config) {
 		c.BootstrapExpect = 3 // Won't become leader
 		c.DevDisableBootstrap = true
 	})

diff --git a/nomad/leader_test.go b/nomad/leader_test.go
@@ -982,7 +982,7 @@ func TestLeader_RollRaftServer(t *testing.T) {
 }
 
 func TestLeader_RevokeLeadership_MultipleTimes(t *testing.T) {
-	s1 := testServer(t, nil)
+	s1 := TestServer(t, nil)
 	defer s1.Shutdown()
 	testutil.WaitForLeader(t, s1.RPC)