From cdb28bf46fe5c48cf03c67de3ecfead2d35f264a Mon Sep 17 00:00:00 2001 From: Diptanu Choudhury Date: Wed, 25 Nov 2015 18:37:51 -0800 Subject: [PATCH] Added a test for modifying check --- client/consul.go | 1 - client/consul_test.go | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/client/consul.go b/client/consul.go index 201ab4d31..17dc876e1 100644 --- a/client/consul.go +++ b/client/consul.go @@ -155,7 +155,6 @@ func (c *ConsulService) performSync(agent *consul.Agent) (int, int) { // Add services and checks which Consul doesn't know about for _, trackedTask := range c.trackedTasks { - fmt.Printf("DIPTANU services in Task %v \n", len(trackedTask.task.Services)) for _, service := range trackedTask.task.Services { knownServices[service.Id] = struct{}{} if _, ok := consulServices[service.Id]; !ok { diff --git a/client/consul_test.go b/client/consul_test.go index 9d205082c..673ba18f6 100644 --- a/client/consul_test.go +++ b/client/consul_test.go @@ -202,3 +202,38 @@ func TestConsul_AddCheck_To_Service(t *testing.T) { t.Fatalf("Expected tracked checks: %v, actual: %v", 1, totalChecks) } } + +func TestConsul_ModifyCheck(t *testing.T) { + c := newConsulService() + task := newTask() + var checks []*structs.ServiceCheck + s1 := structs.Service{ + Id: "1-example-cache-redis", + Name: "example-cache-redis", + Tags: []string{"global"}, + PortLabel: "db", + Checks: checks, + } + task.Services = append(task.Services, &s1) + c.Register(task, "1") + + check1 := structs.ServiceCheck{ + Name: "alive", + Type: "tcp", + Interval: 10 * time.Second, + Timeout: 5 * time.Second, + } + + s1.Checks = append(s1.Checks, &check1) + + _, totalChecks := c.performSync(c.client.Agent()) + if totalChecks != 1 { + t.Fatalf("Expected tracked checks: %v, actual: %v", 1, totalChecks) + } + check1.Timeout = 2 * time.Second + _, totalChecks = c.performSync(c.client.Agent()) + if totalChecks != 1 { + t.Fatalf("Expected tracked checks: %v, actual: %v", 1, totalChecks) + } + +}