Fix flaky test deadlock

Author: OrlandoCo

pkg/sender_test.go

@@ -118,7 +118,7 @@ forLoop:
 					assert.NotEqual(t, fakePkt.PayloadType, pkt.PayloadType)
 					assert.Equal(t, senderTrack.Codec().PayloadType, pkt.PayloadType)
 					tmr.Stop()
-					return
+					break
 				}
 				select {
 				case <-tmr.C:
@@ -127,6 +127,8 @@ forLoop:
 			}
 		})
 	}
+	_ = sfu.Close()
+	_ = remote.Close()
 }
 
 func TestWebRTCSender_receiveRTCP(t *testing.T) {
@@ -218,6 +220,7 @@ forLoop:
 			assert.NoError(t, err)
 			err = remote.WriteRTCP([]rtcp.Packet{tt.want, tt.want, tt.want, tt.want})
 			assert.NoError(t, err)
+		testLoop:
 			for {
 				select {
 				case <-tmr.C:
@@ -227,11 +230,11 @@ forLoop:
 					case *rtcp.PictureLossIndication:
 						tmr.Stop()
 						wss.Close()
-						return
+						break testLoop
 					case *rtcp.FullIntraRequest:
 						tmr.Stop()
 						wss.Close()
-						return
+						break testLoop
 					case *rtcp.TransportLayerNack:
 						continue
 					}
@@ -241,6 +244,8 @@ forLoop:
 			}
 		})
 	}
+	_ = sfu.Close()
+	_ = remote.Close()
 }
 
 func TestWebRTCSender_Close(t *testing.T) {

pkg/simulcastsender_test.go

@@ -160,13 +160,14 @@ forLoop:
 				}
 				tmr := time.NewTimer(100 * time.Millisecond)
 				s.WriteRTP(tt.fields.packet)
+			testLoop:
 				for {
 					select {
 					case <-tmr.C:
 						t.Fatal("PLI packet not received")
 					case <-gotPli:
 						tmr.Stop()
-						return
+						break testLoop
 					}
 				}
 			}
@@ -187,7 +188,8 @@ forLoop:
 
 		})
 	}
-
+	_ = sfu.Close()
+	_ = remote.Close()
 }
 
 func TestWebRTCSimulcastSender_receiveRTCP(t *testing.T) {
@@ -278,6 +280,7 @@ forLoop:
 			}
 			go wss.receiveRTCP()
 			tmr := time.NewTimer(1000 * time.Millisecond)
+		testLoop:
 			for {
 				select {
 				case <-tmr.C:
@@ -291,19 +294,21 @@ forLoop:
 						assert.Equal(t, recvSSRC, pkt.DestinationSSRC()[0])
 						tmr.Stop()
 						wss.Close()
-						return
+						break testLoop
 					case *rtcp.FullIntraRequest:
 						assert.Equal(t, recvSSRC, pkt.DestinationSSRC()[0])
 						tmr.Stop()
 						wss.Close()
-						return
+						break testLoop
 					case *rtcp.TransportLayerNack:
 						continue
 					}
 				}
 			}
 		})
 	}
+	_ = sfu.Close()
+	_ = remote.Close()
 }
 
 func TestWebRTCSimulcastSender_Close(t *testing.T) {

pkg/webrtctransport_test.go

@@ -437,17 +437,20 @@ func TestWebRTCTransport_OnDataChannel(t *testing.T) {
 			err = signalPair(remote, sfu)
 			assert.NoError(t, err)
 			tmr := time.NewTimer(5000 * time.Millisecond)
+		testLoop:
 			for {
 				select {
 				case <-tmr.C:
 					t.Fatal("onDataChannel not called")
 				case <-dcChan:
 					tmr.Stop()
-					return
+					break testLoop
 				}
 			}
 		})
 	}
+	_ = sfu.Close()
+	_ = remote.Close()
 }
 
 func TestWebRTCTransport_OnNegotiationNeeded(t *testing.T) {
@@ -502,17 +505,20 @@ func TestWebRTCTransport_OnNegotiationNeeded(t *testing.T) {
 			_, err = sfu.AddTrack(senderTrack)
 			assert.NoError(t, err)
 			tmr := time.NewTimer(5000 * time.Millisecond)
+		testLoop:
 			for {
 				select {
 				case <-tmr.C:
 					t.Fatal("onNegotiation not called")
 				case <-negChan:
 					tmr.Stop()
-					return
+					break testLoop
 				}
 			}
 		})
 	}
+	_ = sfu.Close()
+	_ = remote.Close()
 }
 
 func TestWebRTCTransport_OnTrack(t *testing.T) {
@@ -747,25 +753,38 @@ forLoop:
 				SenderSSRC: 12345,
 				MediaSSRC:  12345,
 			}
-			rtcpChan <- &rtcp.PictureLossIndication{
-				SenderSSRC: 12345,
-				MediaSSRC:  12345,
-			}
 			go p.sendRTCP(tt.args.recv)
 			tmr := time.NewTimer(1000 * time.Millisecond)
+			gotRTCP := make(chan struct{}, 1)
+			go func() {
+				for {
+					pkt, err := s.ReadRTCP()
+					assert.NoError(t, err)
+					if len(pkt) > 0 {
+						gotRTCP <- struct{}{}
+						return
+					}
+				}
+			}()
+
+		testLoop:
 			for {
-				pkt, err := s.ReadRTCP()
-				assert.NoError(t, err)
-				if len(pkt) > 0 {
+				select {
+				case <-time.After(10 * time.Millisecond):
+					rtcpChan <- &rtcp.PictureLossIndication{
+						SenderSSRC: 12345,
+						MediaSSRC:  12345,
+					}
+				case <-gotRTCP:
 					close(rtcpChan)
 					tmr.Stop()
-					return
-				}
-				select {
+					break testLoop
 				case <-tmr.C:
 					t.Fatal("onNegotiation not called")
 				}
 			}
 		})
 	}
+	_ = sfu.Close()
+	_ = remote.Close()
 }