server: make Close() wait for all resources to close

This commit is contained in:
aler9
2021-11-12 17:38:35 +01:00
committed by Alessandro Ros
parent 08ab7f87ac
commit f304ec52fb
5 changed files with 12 additions and 51 deletions

View File

@@ -110,7 +110,6 @@ func TestServerReadSetupPath(t *testing.T) {
err = s.Start()
require.NoError(t, err)
defer s.Wait()
defer s.Close()
conn, err := net.Dial("tcp", "localhost:8554")
@@ -176,7 +175,6 @@ func TestServerReadSetupErrors(t *testing.T) {
err = s.Start()
require.NoError(t, err)
defer s.Wait()
defer s.Close()
conn, err := net.Dial("tcp", "localhost:8554")
@@ -344,7 +342,6 @@ func TestServerRead(t *testing.T) {
err = s.Start()
require.NoError(t, err)
defer s.Wait()
defer s.Close()
nconn, err := net.Dial("tcp", listenIP+":8554")
@@ -604,7 +601,6 @@ func TestServerReadNonStandardFrameSize(t *testing.T) {
err = s.Start()
require.NoError(t, err)
defer s.Wait()
defer s.Close()
nconn, err := net.Dial("tcp", "localhost:8554")
@@ -705,7 +701,6 @@ func TestServerReadTCPResponseBeforeFrames(t *testing.T) {
err = s.Start()
require.NoError(t, err)
defer s.Wait()
defer s.Close()
conn, err := net.Dial("tcp", "localhost:8554")
@@ -778,7 +773,6 @@ func TestServerReadPlayPlay(t *testing.T) {
err = s.Start()
require.NoError(t, err)
defer s.Wait()
defer s.Close()
conn, err := net.Dial("tcp", "localhost:8554")
@@ -887,7 +881,6 @@ func TestServerReadPlayPausePlay(t *testing.T) {
err = s.Start()
require.NoError(t, err)
defer s.Wait()
defer s.Close()
conn, err := net.Dial("tcp", "localhost:8554")
@@ -1003,7 +996,6 @@ func TestServerReadPlayPausePause(t *testing.T) {
err = s.Start()
require.NoError(t, err)
defer s.Wait()
defer s.Close()
conn, err := net.Dial("tcp", "localhost:8554")
@@ -1116,7 +1108,6 @@ func TestServerReadTimeout(t *testing.T) {
err = s.Start()
require.NoError(t, err)
defer s.Wait()
defer s.Close()
nconn, err := net.Dial("tcp", "localhost:8554")
@@ -1215,7 +1206,6 @@ func TestServerReadWithoutTeardown(t *testing.T) {
err = s.Start()
require.NoError(t, err)
defer s.Wait()
defer s.Close()
nconn, err := net.Dial("tcp", "localhost:8554")
@@ -1303,7 +1293,6 @@ func TestServerReadUDPChangeConn(t *testing.T) {
err = s.Start()
require.NoError(t, err)
defer s.Wait()
defer s.Close()
sxID := ""
@@ -1396,7 +1385,6 @@ func TestServerReadErrorUDPSamePorts(t *testing.T) {
err = s.Start()
require.NoError(t, err)
defer s.Wait()
defer s.Close()
func() {
@@ -1503,7 +1491,6 @@ func TestServerReadNonSetuppedPath(t *testing.T) {
err = s.Start()
require.NoError(t, err)
defer s.Wait()
defer s.Close()
conn, err := net.Dial("tcp", "localhost:8554")
@@ -1669,7 +1656,6 @@ func TestServerReadAdditionalInfos(t *testing.T) {
err = s.Start()
require.NoError(t, err)
defer s.Wait()
defer s.Close()
buf, err := (&rtp.Packet{