From 9e73d1b8499790e15f6a2a6b4d9165ec46eb947f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Tisa=CC=88ter?= Date: Fri, 9 May 2014 02:09:53 +0200 Subject: [PATCH] Remove all sleeps from `kvs_endpoint_test.go` --- consul/kvs_endpoint_test.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/consul/kvs_endpoint_test.go b/consul/kvs_endpoint_test.go index 5c3eef6211..32ab830ea9 100644 --- a/consul/kvs_endpoint_test.go +++ b/consul/kvs_endpoint_test.go @@ -1,10 +1,10 @@ package consul import ( + "github.com/hashicorp/consul/testutil" "github.com/hashicorp/consul/consul/structs" "os" "testing" - "time" ) func TestKVS_Apply(t *testing.T) { @@ -14,8 +14,7 @@ func TestKVS_Apply(t *testing.T) { client := rpcClient(t, s1) defer client.Close() - // Wait for leader - time.Sleep(100 * time.Millisecond) + testutil.WaitForLeader(t, client.Call, "dc1") arg := structs.KVSRequest{ Datacenter: "dc1", @@ -71,8 +70,7 @@ func TestKVS_Get(t *testing.T) { client := rpcClient(t, s1) defer client.Close() - // Wait for leader - time.Sleep(100 * time.Millisecond) + testutil.WaitForLeader(t, client.Call, "dc1") arg := structs.KVSRequest{ Datacenter: "dc1", @@ -119,8 +117,7 @@ func TestKVSEndpoint_List(t *testing.T) { client := rpcClient(t, s1) defer client.Close() - // Wait for leader - time.Sleep(100 * time.Millisecond) + testutil.WaitForLeader(t, client.Call, "dc1") keys := []string{ "/test/key1", @@ -179,8 +176,7 @@ func TestKVSEndpoint_ListKeys(t *testing.T) { client := rpcClient(t, s1) defer client.Close() - // Wait for leader - time.Sleep(100 * time.Millisecond) + testutil.WaitForLeader(t, client.Call, "dc1") keys := []string{ "/test/key1",