status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix tests after merge

This commit is contained in:
Ryan Uber 2015-05-11 18:53:09 -07:00
parent d9f35c7eac
commit 72ee584df3
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/agent_test.go
View File

@ -86,8 +86,9 @@ func TestAgent_Services(t *testing.T) {
} }
func TestAgent_Services_CheckPassing(t *testing.T) { func TestAgent_Services_CheckPassing(t *testing.T) {
t.Parallel()
c, s := makeClient(t) c, s := makeClient(t)
defer s.stop() defer s.Stop()
agent := c.Agent() agent := c.Agent()
reg := &AgentServiceRegistration{ reg := &AgentServiceRegistration{
@ -129,8 +130,9 @@ func TestAgent_Services_CheckPassing(t *testing.T) {
} }
func TestAgent_Services_CheckBadStatus(t *testing.T) { func TestAgent_Services_CheckBadStatus(t *testing.T) {
t.Parallel()
c, s := makeClient(t) c, s := makeClient(t)
defer s.stop() defer s.Stop()
agent := c.Agent() agent := c.Agent()
reg := &AgentServiceRegistration{ reg := &AgentServiceRegistration{
@ -312,8 +314,9 @@ func TestAgent_Checks(t *testing.T) {
} }
func TestAgent_CheckStartPassing(t *testing.T) { func TestAgent_CheckStartPassing(t *testing.T) {
t.Parallel()
c, s := makeClient(t) c, s := makeClient(t)
defer s.stop() defer s.Stop()
agent := c.Agent() agent := c.Agent()

2
command/agent/agent_test.go
View File

@ -383,7 +383,7 @@ func TestAgent_AddCheck_StartPassing(t *testing.T) {
Script: "exit 0", Script: "exit 0",
Interval: 15 * time.Second, Interval: 15 * time.Second,
} }
err := agent.AddCheck(health, chk, false) err := agent.AddCheck(health, chk, false, "")
if err != nil { if err != nil {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }