Browse Source

tests: fix race condition in tests (#1629)

pull/1611/head
Alessandro Ros 3 years ago committed by GitHub
parent
commit
c9dea38e27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 20
      internal/core/rtsp_server_test.go

20
internal/core/rtsp_server_test.go

@ -279,7 +279,6 @@ func TestRTSPServerPublisherOverride(t *testing.T) { @@ -279,7 +279,6 @@ func TestRTSPServerPublisherOverride(t *testing.T) {
} {
t.Run(ca, func(t *testing.T) {
conf := "rtmpDisable: yes\n" +
"protocols: [tcp]\n" +
"paths:\n" +
" all:\n"
@ -338,7 +337,11 @@ func TestRTSPServerPublisherOverride(t *testing.T) { @@ -338,7 +337,11 @@ func TestRTSPServerPublisherOverride(t *testing.T) {
_, err = c.Play(nil)
require.NoError(t, err)
err = s1.WritePacketRTP(medi, &rtp.Packet{
if ca == "enabled" {
err := s1.Wait()
require.EqualError(t, err, "EOF")
err = s2.WritePacketRTP(medi, &rtp.Packet{
Header: rtp.Header{
Version: 0x02,
PayloadType: 96,
@ -347,16 +350,11 @@ func TestRTSPServerPublisherOverride(t *testing.T) { @@ -347,16 +350,11 @@ func TestRTSPServerPublisherOverride(t *testing.T) {
SSRC: 978651231,
Marker: true,
},
Payload: []byte{0x01, 0x02, 0x03, 0x04},
Payload: []byte{0x05, 0x06, 0x07, 0x08},
})
if ca == "enabled" {
require.Error(t, err)
} else {
require.NoError(t, err)
}
if ca == "enabled" {
err = s2.WritePacketRTP(medi, &rtp.Packet{
} else {
err = s1.WritePacketRTP(medi, &rtp.Packet{
Header: rtp.Header{
Version: 0x02,
PayloadType: 96,
@ -365,7 +363,7 @@ func TestRTSPServerPublisherOverride(t *testing.T) { @@ -365,7 +363,7 @@ func TestRTSPServerPublisherOverride(t *testing.T) {
SSRC: 978651231,
Marker: true,
},
Payload: []byte{0x05, 0x06, 0x07, 0x08},
Payload: []byte{0x01, 0x02, 0x03, 0x04},
})
require.NoError(t, err)
}

Loading…
Cancel
Save