From 72ee584df37075d8b46c1f31ce15a6bf07919e55 Mon Sep 17 00:00:00 2001 From: Ryan Uber Date: Mon, 11 May 2015 18:53:09 -0700 Subject: [PATCH] Fix tests after merge --- api/agent_test.go | 9 ++++++--- command/agent/agent_test.go | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/api/agent_test.go b/api/agent_test.go index daeb7d6b06..358c12a6c2 100644 --- a/api/agent_test.go +++ b/api/agent_test.go @@ -86,8 +86,9 @@ func TestAgent_Services(t *testing.T) { } func TestAgent_Services_CheckPassing(t *testing.T) { + t.Parallel() c, s := makeClient(t) - defer s.stop() + defer s.Stop() agent := c.Agent() reg := &AgentServiceRegistration{ @@ -129,8 +130,9 @@ func TestAgent_Services_CheckPassing(t *testing.T) { } func TestAgent_Services_CheckBadStatus(t *testing.T) { + t.Parallel() c, s := makeClient(t) - defer s.stop() + defer s.Stop() agent := c.Agent() reg := &AgentServiceRegistration{ @@ -312,8 +314,9 @@ func TestAgent_Checks(t *testing.T) { } func TestAgent_CheckStartPassing(t *testing.T) { + t.Parallel() c, s := makeClient(t) - defer s.stop() + defer s.Stop() agent := c.Agent() diff --git a/command/agent/agent_test.go b/command/agent/agent_test.go index 92aad75efc..7a2b43f764 100644 --- a/command/agent/agent_test.go +++ b/command/agent/agent_test.go @@ -383,7 +383,7 @@ func TestAgent_AddCheck_StartPassing(t *testing.T) { Script: "exit 0", Interval: 15 * time.Second, } - err := agent.AddCheck(health, chk, false) + err := agent.AddCheck(health, chk, false, "") if err != nil { t.Fatalf("err: %v", err) }