Skip to content

Commit f5b65d1

Browse files
author
Roman Volosatovs
committed
gs: Adapt to event package changes
1 parent 5e28ed0 commit f5b65d1

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

pkg/gatewayserver/gatewayserver_test.go

+17-7
Original file line numberDiff line numberDiff line change
@@ -484,13 +484,6 @@ func TestGatewayServer(t *testing.T) {
484484

485485
t.Run("Upstream", func(t *testing.T) {
486486
uplinkCount := 0
487-
upEvents := map[string]events.Channel{}
488-
for _, event := range []string{"gs.up.receive", "gs.down.tx.success", "gs.down.tx.fail", "gs.status.receive"} {
489-
ch := make(events.Channel, 5)
490-
events.Subscribe(event, ch)
491-
defer events.Unsubscribe(event, ch)
492-
upEvents[event] = ch
493-
}
494487
for _, tc := range []struct {
495488
Name string
496489
Up *ttnpb.GatewayUp
@@ -664,6 +657,23 @@ func TestGatewayServer(t *testing.T) {
664657
t.Run(tc.Name, func(t *testing.T) {
665658
a := assertions.New(t)
666659

660+
upEvents := map[string]events.Channel{}
661+
for _, event := range []string{"gs.up.receive", "gs.down.tx.success", "gs.down.tx.fail", "gs.status.receive"} {
662+
upEvents[event] = make(events.Channel, 5)
663+
}
664+
defer test.SetDefaultEventsPubSub(&test.MockEventPubSub{
665+
PublishFunc: func(ev events.Event) {
666+
switch name := ev.Name(); name {
667+
case "gs.up.receive", "gs.down.tx.success", "gs.down.tx.fail", "gs.status.receive":
668+
go func() {
669+
upEvents[name] <- ev
670+
}()
671+
default:
672+
t.Logf("%s event published", name)
673+
}
674+
},
675+
})()
676+
667677
select {
668678
case upCh <- tc.Up:
669679
case <-time.After(timeout):

0 commit comments

Comments
 (0)