cleanup

Author: dunglas

bolt_test.go

@@ -247,14 +247,15 @@ func TestBoltTransportDoNotDispatchUntilListen(t *testing.T) {
 	var wg sync.WaitGroup
 	wg.Add(1)
 	go func() {
-		defer wg.Done()
-
 		for range s.Receive() {
 			t.Fail()
 		}
+
+		wg.Done()
 	}()
 
 	s.Disconnect()
+
 	wg.Wait()
 }
 
@@ -303,7 +304,8 @@ func TestBoltTransportClosed(t *testing.T) {
 
 	assert.Equal(t, transport.Dispatch(&Update{Topics: s.SubscribedTopics}), ErrClosedTransport)
 
-	<-s.Receive()
+	_, ok := <-s.Receive()
+	assert.False(t, ok)
 }
 
 func TestBoltCleanDisconnectedSubscribers(t *testing.T) {

local_test.go

@@ -28,11 +28,11 @@ func TestLocalTransportDoNotDispatchUntilListen(t *testing.T) {
 	var wg sync.WaitGroup
 	wg.Add(1)
 	go func() {
-		defer wg.Done()
-
 		for range s.Receive() {
 			t.Fail()
 		}
+
+		wg.Done()
 	}()
 
 	s.Disconnect()
@@ -73,7 +73,8 @@ func TestLocalTransportClosed(t *testing.T) {
 	assert.Equal(t, transport.AddSubscriber(NewLocalSubscriber("", logger, tss)), ErrClosedTransport)
 	assert.Equal(t, transport.Dispatch(&Update{}), ErrClosedTransport)
 
-	<-s.Receive()
+	_, ok := <-s.Receive()
+	assert.False(t, ok)
 }
 
 func TestLiveCleanDisconnectedSubscribers(t *testing.T) {

localsubscriber.go

@@ -53,9 +53,9 @@ func (s *LocalSubscriber) Dispatch(u *Update, fromHistory bool) bool {
 
 	if !fromHistory && s.ready.Load() < 1 {
 		s.liveMutex.Lock()
-		defer s.liveMutex.Unlock()
-
 		s.liveQueue = append(s.liveQueue, u)
+		s.liveMutex.Unlock()
+
 		s.outMutex.Unlock()
 
 		return true

subscriber_test.go

@@ -90,5 +90,6 @@ func TestSubscriberDoesNotBlockWhenChanIsFull(t *testing.T) {
 		s.Dispatch(&Update{}, false)
 	}
 
-	<-s.Receive()
+	for range s.Receive() {
+	}
 }