test target: update -> listen to events

[src/xds/xds-server.git] / test / target_test.go

diff --git a/test/target_test.go b/test/target_test.go
index 696c8fc..77d4bf1 100644 (file)
--- a/test/target_test.go
+++ b/test/target_test.go
@@ -40,7 +40,35 @@ func flushChannelTerm(channel chan xsapiv1.TerminalOutMsg, ms time.Duration) {
        }
 }
 
+func ConnectTargetEvents(t *testing.T, channel chan xsapiv1.TargetConfig) {
+       sCli.Conn.On(xsapiv1.EVTTargetAdd, func(e xsapiv1.EventMsg) {
+               target, _ := e.DecodeTargetEvent()
+               channel <- target
+       })
+
+       args := xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTTargetAdd}
+       assert.Nil(t, HTTPCli.Post("/events/register", args, nil))
+
+       sCli.Conn.On(xsapiv1.EVTTargetRemove, func(e xsapiv1.EventMsg) {
+               target, _ := e.DecodeTargetEvent()
+               channel <- target
+       })
+
+       args = xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTTargetRemove}
+       assert.Nil(t, HTTPCli.Post("/events/register", args, nil))
+}
+
+func DisconnectTargetEvents(t *testing.T) {
+       args := xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTTargetAdd}
+       assert.Nil(t, HTTPCli.Post("/events/unregister", args, nil))
+       args = xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTTargetRemove}
+       assert.Nil(t, HTTPCli.Post("/events/unregister", args, nil))
+}
+
 func TestTarget(t *testing.T) {
+       chTarget := make(chan xsapiv1.TargetConfig)
+       defer close(chTarget)
+       ConnectTargetEvents(t, chTarget)
        var targetArray []xsapiv1.TargetConfig
        assert.Nil(t, HTTPCli.Get("/targets", &targetArray))
        assert.Equal(t, len(targetArray), 0)
@@ -53,7 +81,11 @@ func TestTarget(t *testing.T) {
        var targetRes, targetResBis xsapiv1.TargetConfig
        assert.Nil(t, HTTPCli.Post("/targets", target, &targetRes))
        target.Name = "fakeTargetBis"
+       targetEvt := <-chTarget
+       assert.Equal(t, targetRes.ID, targetEvt.ID)
        assert.Nil(t, HTTPCli.Post("/targets", target, &targetResBis))
+       targetEvt = <-chTarget
+       assert.Equal(t, targetResBis.ID, targetEvt.ID)
        assert.Equal(t, targetRes.Status, "Enable")
        assert.Equal(t, targetResBis.Status, "Enable")
 
@@ -70,10 +102,7 @@ func TestTarget(t *testing.T) {
 
        chTerm := make(chan xsapiv1.TerminalOutMsg)
        defer close(chTerm)
-       sCli, err := NewIoSocketClient(prefixURL, HTTPCli.GetClientID())
-       if err != nil {
-               t.Fatal(err)
-       }
+
        sCli.Conn.On(xsapiv1.TerminalOutEvent, func(ev xsapiv1.TerminalOutMsg) {
                chTerm <- ev
        })
@@ -106,7 +135,7 @@ func TestTarget(t *testing.T) {
                flushChannelTerm(chTerm, 50)
 
                /*check that toto file is created*/
-               _, err = os.Stat(totoFileCurrent)
+               _, err := os.Stat(totoFileCurrent)
                assert.Nil(t, err)
 
                data = []byte("cat " + totoFileCurrent + "\n")
@@ -134,8 +163,11 @@ func TestTarget(t *testing.T) {
                }
                var tgtRes xsapiv1.TargetConfig
                assert.Nil(t, HTTPCli.Delete("/targets/"+targetArray[i].ID, &tgtRes))
+               targetEvt = <-chTarget
+               assert.Equal(t, tgtRes.ID, targetEvt.ID)
                assert.Equal(t, targetArray[i].ID, tgtRes.ID)
        }
+       DisconnectTargetEvents(t)
 }
 
 func TestTargetErrors(t *testing.T) {