merge tests

serverconf_test.go

@@ -217,38 +217,6 @@ func TestServerTeardownResponse(t *testing.T) {
 	require.Equal(t, io.EOF, err)
 }
 
-func TestServerPublishReadTCP(t *testing.T) {
-	ts, err := newTestServ(nil)
-	require.NoError(t, err)
-	defer ts.close()
-
-	cnt1, err := newContainer("ffmpeg", "publish", []string{
-		"-re",
-		"-stream_loop", "-1",
-		"-i", "/emptyvideo.ts",
-		"-c", "copy",
-		"-f", "rtsp",
-		"-rtsp_transport", "tcp",
-		"rtsp://localhost:8554/teststream",
-	})
-	require.NoError(t, err)
-	defer cnt1.close()
-
-	time.Sleep(1 * time.Second)
-
-	cnt2, err := newContainer("ffmpeg", "read", []string{
-		"-rtsp_transport", "tcp",
-		"-i", "rtsp://localhost:8554/teststream",
-		"-vframes", "1",
-		"-f", "image2",
-		"-y", "/dev/null",
-	})
-	require.NoError(t, err)
-	defer cnt2.close()
-
-	require.Equal(t, 0, cnt2.wait())
-}
-
 var serverCert = []byte(`-----BEGIN CERTIFICATE-----
 MIIDazCCAlOgAwIBAgIUXw1hEC3LFpTsllv7D3ARJyEq7sIwDQYJKoZIhvcNAQEL
 BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
@@ -301,10 +269,34 @@ y++U32uuSFiXDcSLarfIsE992MEJLSAynbF1Rsgsr3gXbGiuToJRyxbIeVy7gwzD
 -----END RSA PRIVATE KEY-----
 `)
 
-func TestServerPublishReadTLS(t *testing.T) {
+func TestServerPublishReadTCP(t *testing.T) {
+	for _, ca := range []struct {
+		publisher string
+		encrypted bool
+	}{
+		{"ffmpeg", false},
+		{"ffmpeg", true},
+	} {
+		encryptedStr := func() string {
+			if ca.encrypted {
+				return "encrypted"
+			}
+			return "plain"
+		}()
+
+		t.Run(ca.publisher+"_"+encryptedStr, func(t *testing.T) {
+			var proto string
+			var tlsConf *tls.Config
+			if !ca.encrypted {
+				proto = "rtsp"
+				tlsConf = nil
+
+			} else {
+				proto = "rtsps"
 				cert, err := tls.X509KeyPair(serverCert, serverKey)
 				require.NoError(t, err)
-	tlsConf := &tls.Config{Certificates: []tls.Certificate{cert}}
+				tlsConf = &tls.Config{Certificates: []tls.Certificate{cert}}
+			}
 
 			ts, err := newTestServ(tlsConf)
 			require.NoError(t, err)
@@ -317,7 +309,7 @@ func TestServerPublishReadTLS(t *testing.T) {
 				"-c", "copy",
 				"-f", "rtsp",
 				"-rtsp_transport", "tcp",
-		"rtsps://localhost:8554/teststream",
+				proto + "://localhost:8554/teststream",
 			})
 			require.NoError(t, err)
 			defer cnt1.close()
@@ -326,7 +318,7 @@ func TestServerPublishReadTLS(t *testing.T) {
 
 			cnt2, err := newContainer("ffmpeg", "read", []string{
 				"-rtsp_transport", "tcp",
-		"-i", "rtsps://localhost:8554/teststream",
+				"-i", proto + "://localhost:8554/teststream",
 				"-vframes", "1",
 				"-f", "image2",
 				"-y", "/dev/null",
@@ -335,4 +327,6 @@ func TestServerPublishReadTLS(t *testing.T) {
 			defer cnt2.close()
 
 			require.Equal(t, 0, cnt2.wait())
+		})
+	}
 }

testimages/ffmpeg/start.sh

@@ -1,3 +1,3 @@
 #!/bin/sh -e
 
-exec ffmpeg -hide_banner -loglevel error $@
+exec ffmpeg -hide_banner -loglevel error $@ 2>&1