watch: convert TestServiceWatch to use channels

watch/funcs_test.go

@@ -281,49 +281,55 @@ func TestServiceWatch(t *testing.T) {
 	a := agent.NewTestAgent(t.Name(), ``)
 	defer a.Shutdown()
 
+	invoke := make(chan error)
 	plan := mustParse(t, `{"type":"service", "service":"foo", "tag":"bar", "passingonly":true}`)
-	invoke := 0
 	plan.Handler = func(idx uint64, raw interface{}) {
-		if invoke == 0 {
+		if raw == nil {
-			if raw == nil {
+			return // ignore
-				return
-			}
-			v, ok := raw.([]*consulapi.ServiceEntry)
-			if ok && len(v) == 0 {
-				return
-			}
-			if !ok || v[0].Service.ID != "foo" {
-				t.Fatalf("Bad: %#v", raw)
-			}
-			invoke++
 		}
+		v, ok := raw.([]*consulapi.ServiceEntry)
+		if !ok || len(v) == 0 {
+			return // ignore
+		}
+		if v[0].Service.ID != "foo" {
+			invoke <- errBadContent
+			return
+		}
+		invoke <- nil
 	}
 
-	go func() {
+	var wg sync.WaitGroup
-		time.Sleep(20 * time.Millisecond)
 
+	wg.Add(1)
+	go func() {
+		defer wg.Done()
 		agent := a.Client().Agent()
+
+		time.Sleep(20 * time.Millisecond)
 		reg := &consulapi.AgentServiceRegistration{
 			ID:   "foo",
 			Name: "foo",
 			Tags: []string{"bar"},
 		}
-		agent.ServiceRegister(reg)
+		if err := agent.ServiceRegister(reg); err != nil {
-
+			t.Fatalf("err: %v", err)
-		time.Sleep(20 * time.Millisecond)
+		}
-		plan.Stop()
-
-		agent.ServiceDeregister("foo")
 	}()
 
-	err := plan.Run(a.HTTPAddr())
+	wg.Add(1)
-	if err != nil {
+	go func() {
+		defer wg.Done()
+		if err := plan.Run(a.HTTPAddr()); err != nil {
+			t.Fatalf("err: %v", err)
+		}
+	}()
+
+	if err := <-invoke; err != nil {
 		t.Fatalf("err: %v", err)
 	}
 
-	if invoke == 0 {
+	plan.Stop()
-		t.Fatalf("bad: %v", invoke)
+	wg.Wait()
-	}
 }
 
 func TestChecksWatch_State(t *testing.T) {